Skip to content

Commit d405ac9

Browse files
uqsSupSuper
authored andcommitted
Move CI to ubuntu 20.04 and use the yaml-cpp package
Also upload artifacts (everything for now, to analyze the build) and run a verbose build. Oh, ignore the macOS homebrew update failures that seem to plague the Github CI instances. We don't need super up-to-date packages anyway.
1 parent 5ad5ebe commit d405ac9

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,22 @@ jobs:
2121

2222
include:
2323
- name: Linux
24-
os: ubuntu-latest
24+
os: ubuntu-20.04 # -latest is still stuck at 18.04
2525
packages: >-
2626
libsdl1.2-dev libsdl-mixer1.2-dev
2727
libsdl-image1.2-dev libsdl-gfx1.2-dev
28+
libyaml-cpp-dev
2829
compiler: gcc
2930
cpp-compiler: g++
3031
cflags: "-Wall -Wextra"
3132
cxxflags: "-Wall -Wextra"
3233

3334
- name: Linux
34-
os: ubuntu-latest
35+
os: ubuntu-20.04 # -latest is still stuck at 18.04
3536
packages: >-
3637
libsdl1.2-dev libsdl-mixer1.2-dev
3738
libsdl-image1.2-dev libsdl-gfx1.2-dev
39+
libyaml-cpp-dev
3840
compiler: clang
3941
cpp-compiler: clang++
4042
cflags: "-Wall -Wextra"
@@ -71,10 +73,6 @@ jobs:
7173
sudo apt-get update
7274
sudo apt-get -yq --no-install-suggests --no-install-recommends install ccache ${{ matrix.packages }}
7375
74-
wget -q http://archive.ubuntu.com/ubuntu/pool/main/y/yaml-cpp/libyaml-cpp0.6_0.6.2-4fakesync1_amd64.deb
75-
wget -q http://archive.ubuntu.com/ubuntu/pool/main/y/yaml-cpp/libyaml-cpp-dev_0.6.2-4fakesync1_amd64.deb
76-
sudo dpkg -i libyaml-cpp0.6_0.6.2-4fakesync1_amd64.deb libyaml-cpp-dev_0.6.2-4fakesync1_amd64.deb
77-
7876
- name: Install packages (Windows)
7977
if: runner.os == 'Windows' && matrix.packages
8078
run: |
@@ -83,18 +81,18 @@ jobs:
8381
- name: Install packages (macOS)
8482
if: runner.os == 'macOS'
8583
run: |
86-
brew update
84+
brew update || true # brew update often fails, no biggie.
8785
brew install ccache ${{ matrix.packages }}
8886
8987
- name: Setup Cache
9088
if: runner.os == 'Linux' || runner.os == 'macOS'
91-
uses: actions/cache@v1
89+
uses: actions/cache@v2
9290
with:
9391
path: ~/.ccache
9492
key: ccache-${{ runner.os }}-${{ matrix.compiler }}
9593

9694
- name: Checkout
97-
uses: actions/checkout@v1
95+
uses: actions/checkout@v2
9896

9997
- name: Download dependencies (Windows)
10098
if: runner.os == 'Windows'
@@ -118,7 +116,14 @@ jobs:
118116
- name: Compile source code
119117
run: |
120118
cd ${{ matrix.build-src-dir || '.' }}
121-
cmake --build . --config ${{ matrix.build-config || 'Release' }}
119+
cmake --build . -v -j2 --config ${{ matrix.build-config || 'Release' }}
120+
121+
- name: Archive artifacts
122+
#if: runner.os == 'Windows' # could use if failure()
123+
uses: actions/upload-artifact@v2
124+
with:
125+
name: artifacts ${{ matrix.name }} (${{ matrix.compiler }})
126+
path: ${{ github.workspace }}
122127

123128
- name: ccache stats
124129
if: runner.os == 'Linux' || runner.os == 'macOS'

0 commit comments

Comments
 (0)