Skip to content

Commit 26c1222

Browse files
author
Nuno Leiria
committed
Move all CI steps to uniformly run on ubuntu-22.04, not ubuntu-20.04 or latest.
Stop using latest mesa drivers that can be incompatible with the current OS version. Add libraries that make it easier to run actions locally with act.
1 parent 424387a commit 26c1222

1 file changed

Lines changed: 15 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616

1717
jobs:
1818
clippy:
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-22.04
2020

2121
steps:
2222
- uses: actions/checkout@v3
@@ -37,7 +37,7 @@ jobs:
3737
command: clippy
3838
args: --workspace --examples --tests
3939
clippy-web:
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-22.04
4141

4242
steps:
4343
- uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
5656
run: cargo clippy --workspace
5757

5858
test-linux:
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-22.04
6060
steps:
6161
- name: Free up disk space
6262
run: |
@@ -73,9 +73,8 @@ jobs:
7373
libcairo-dev libgtk2.0-dev libsoup2.4-dev libgtk-3-dev libwebkit2gtk-4.0-dev xorg-dev ninja-build libxcb-render0-dev
7474
- name: Install run (headless) dependencies
7575
run: |
76-
sudo add-apt-repository ppa:oibaf/graphics-drivers -y
7776
sudo apt-get update
78-
sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers
77+
sudo apt install -y libxcb-xfixes0-dev vulkan-validationlayers-dev mesa-vulkan-drivers libasound2-dev
7978
8079
- uses: Leafwing-Studios/cargo-cache@v1
8180
with:
@@ -93,7 +92,7 @@ jobs:
9392
run: tree --du -h target
9493

9594
build-api-and-doc:
96-
runs-on: ubuntu-20.04
95+
runs-on: ubuntu-22.04
9796

9897
steps:
9998
- uses: actions/checkout@v3
@@ -104,7 +103,7 @@ jobs:
104103
run: cargo run -p campfire --no-default-features example check-all
105104

106105
build-web:
107-
runs-on: ubuntu-20.04
106+
runs-on: ubuntu-22.04
108107
steps:
109108
- uses: actions/checkout@v3
110109

@@ -137,23 +136,23 @@ jobs:
137136
include:
138137
- os: macos-latest
139138
- os: windows-latest
140-
- os: ubuntu-20.04
139+
- os: ubuntu-22.04
141140

142141
runs-on: ${{ matrix.os }}
143142
steps:
144143
- name: Free up disk space
145-
if: ${{ matrix.os == 'ubuntu-20.04' }}
144+
if: ${{ matrix.os == 'ubuntu-22.04' }}
146145
run: |
147146
sudo rm -rf /usr/share/dotnet
148147
sudo rm -rf /opt/ghc
149148
sudo rm -rf "/usr/local/share/boost"
150149
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
151150
- name: Install build dependencies
152-
if: ${{ matrix.os == 'ubuntu-20.04' }}
151+
if: ${{ matrix.os == 'ubuntu-22.04' }}
153152
run: |
154153
sudo apt-get update
155154
sudo apt-get install --no-install-recommends -y tree libasound2-dev libglib2.0-dev libxcb-shape0-dev libxcb-xfixes0-dev \
156-
libcairo-dev libgtk2.0-dev libsoup2.4-dev libgtk-3-dev libwebkit2gtk-4.0-dev xorg-dev ninja-build libxcb-render0-dev
155+
libcairo-dev libgtk2.0-dev libsoup2.4-dev libgtk-3-dev libwebkit2gtk-4.0-dev xorg-dev ninja-build libxcb-render0-dev clang nodejs
157156
- uses: actions/checkout@v3
158157
- uses: dtolnay/rust-toolchain@stable
159158
- uses: Leafwing-Studios/cargo-cache@v1
@@ -178,7 +177,7 @@ jobs:
178177
include:
179178
- os: macos-latest
180179
- os: windows-latest
181-
- os: ubuntu-20.04
180+
- os: ubuntu-22.04
182181

183182
runs-on: ${{ matrix.os }}
184183
steps:
@@ -193,9 +192,7 @@ jobs:
193192

194193
golden-image-tests:
195194
needs: build
196-
# Note: we must use a newer Ubuntu for golden image tests, because older
197-
# llvmpipe versions can randomly fail.
198-
runs-on: ubuntu-latest
195+
runs-on: ubuntu-22.04
199196
env:
200197
RUST_LOG: ambient_gpu=info
201198
steps:
@@ -205,13 +202,12 @@ jobs:
205202
- name: Download ambient executable
206203
uses: actions/download-artifact@v3
207204
with:
208-
name: ambient-ubuntu-20.04
205+
name: ambient-ubuntu-22.04
209206
- run: chmod a+x ambient
210207
- name: Install run (headless) dependencies
211208
run: |
212-
sudo add-apt-repository ppa:oibaf/graphics-drivers -y
213209
sudo apt-get update
214-
sudo apt install -y libxcb-xfixes0-dev mesa-vulkan-drivers
210+
sudo apt install -y libxcb-xfixes0-dev vulkan-validationlayers-dev mesa-vulkan-drivers libasound2-dev
215211
216212
- name: Run golden image tests
217213
run: cargo campfire-slim golden-images --ambient-path=./ambient check
@@ -232,7 +228,7 @@ jobs:
232228
# We run out of storage space when trying to build and run the package on Windows.
233229
# It would be nice to fix this at some point.
234230
# - os: windows-latest
235-
- os: ubuntu-20.04
231+
- os: ubuntu-22.04
236232

237233
runs-on: ${{ matrix.os }}
238234
steps:

0 commit comments

Comments
 (0)