Skip to content

Commit 636662f

Browse files
samuel-jimenezsylvestre
authored andcommitted
ci: Update ubuntu-20.04 runners to ubuntu-22.04
Fixes actions/runner-images#11101. cuda-toolkit-11-1 unavailable on ubuntu-22.04.
1 parent 733688f commit 636662f

File tree

1 file changed

+10
-24
lines changed

1 file changed

+10
-24
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,20 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
include:
68-
- os: ubuntu-20.04
69-
# Oldest tested CUDA Toolkit version. Older CTKs might work, but they're
70-
# difficult to test without Ubuntu18.04 GHA runners or containerized jobs.
71-
cuda: "11.1"
72-
extra_desc: cuda11.1
73-
# Oldest supported version, keep in sync with README.md
74-
rustc: "1.75.0"
7568
- os: ubuntu-22.04
7669
# Oldest supported version, keep in sync with README.md
7770
rustc: "1.75.0"
7871
extra_desc: dist-server
7972
extra_args: --no-default-features --features=dist-tests test_dist_ -- --test-threads 1
80-
- os: ubuntu-20.04
73+
- os: ubuntu-22.04
8174
rustc: stable
82-
- os: ubuntu-20.04
75+
- os: ubuntu-22.04
8376
rustc: beta
84-
- os: ubuntu-20.04
77+
- os: ubuntu-22.04
8578
rustc: nightly
8679
allow_failure: true
8780
extra_args: --features=unstable
88-
- os: ubuntu-20.04
81+
- os: ubuntu-22.04
8982
extra_desc: no-default-features
9083
extra_args: --no-default-features
9184
allow_failure: true
@@ -156,14 +149,7 @@ jobs:
156149
sudo apt remove -y gcc-14 g++-14
157150
sudo apt autoremove -y
158151
fi
159-
# Ubuntu20.04's clang-10 is too old for CTK 11+, so install clang-12 instead
160-
if test "${{ matrix.os }}" = "ubuntu-20.04" && test -n "${{ matrix.cuda }}"; then
161-
sudo apt install -y --no-install-recommends gcc clang-12
162-
sudo ln -sf $(which clang-12) /usr/bin/clang
163-
sudo ln -sf $(which clang++-12) /usr/bin/clang++
164-
else
165-
sudo apt install -y --no-install-recommends gcc clang
166-
fi
152+
sudo apt install -y --no-install-recommends gcc clang
167153
echo 'gcc version:'
168154
gcc --version
169155
echo 'clang version:'
@@ -196,21 +182,21 @@ jobs:
196182
fail-fast: false
197183
matrix:
198184
include:
199-
- os: ubuntu-20.04
185+
- os: ubuntu-22.04
200186
target: x86_64-unknown-linux-musl
201187
container: '{"image": "messense/rust-musl-cross:x86_64-musl"}'
202-
- os: ubuntu-20.04
188+
- os: ubuntu-22.04
203189
binary: sccache-dist
204190
extra_args: --no-default-features --features="dist-server"
205191
target: x86_64-unknown-linux-musl
206192
container: '{"image": "messense/rust-musl-cross:x86_64-musl"}'
207-
- os: ubuntu-20.04
193+
- os: ubuntu-22.04
208194
target: aarch64-unknown-linux-musl
209195
container: '{"image": "messense/rust-musl-cross:aarch64-musl"}'
210-
- os: ubuntu-20.04
196+
- os: ubuntu-22.04
211197
target: armv7-unknown-linux-musleabi
212198
container: '{"image": "messense/rust-musl-cross:armv7-musleabi"}'
213-
- os: ubuntu-20.04
199+
- os: ubuntu-22.04
214200
target: i686-unknown-linux-musl
215201
container: '{"image": "messense/rust-musl-cross:i686-musl"}'
216202
- os: macos-13

0 commit comments

Comments
 (0)