Skip to content

Commit 688acf7

Browse files
authored
Merge pull request #762 from striezel-stash/ci-ubuntu.20.04-deprecation
ci: move Ubuntu 20.04 builds to container or newer Ubuntu version
2 parents 49d9276 + dc89ecd commit 688acf7

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,20 @@ jobs:
2929
- toolset: gcc-7
3030
cxxstd: "14,17"
3131
install: g++-7
32-
os: ubuntu-20.04
32+
os: ubuntu-latest
33+
container: ubuntu:20.04
3334
- toolset: gcc-8
3435
cxxstd: "14"
35-
os: ubuntu-20.04
36+
os: ubuntu-latest
37+
container: ubuntu:20.04
3638
install: g++-8
3739
- toolset: gcc-9
3840
cxxstd: "14,17"
39-
os: ubuntu-20.04
41+
os: ubuntu-24.04
4042
install: g++-9
4143
- toolset: gcc-10
4244
cxxstd: "14,17"
43-
os: ubuntu-20.04
45+
os: ubuntu-24.04
4446
install: g++-10
4547
- toolset: clang
4648
compiler: clang++-3.9
@@ -63,27 +65,33 @@ jobs:
6365
- toolset: clang
6466
compiler: clang++-6.0
6567
cxxstd: "14,17"
66-
os: ubuntu-20.04
68+
os: ubuntu-latest
69+
container: ubuntu:20.04
6770
install: clang-6.0
6871
- toolset: clang
6972
compiler: clang++-7
7073
cxxstd: "14,17"
71-
os: ubuntu-20.04
74+
os: ubuntu-latest
75+
container: ubuntu:20.04
7276
install: clang-7
7377
- toolset: clang
7478
compiler: clang++-8
7579
cxxstd: "14,17"
76-
os: ubuntu-20.04
80+
os: ubuntu-latest
81+
container: ubuntu:20.04
7782
install: clang-8
7883
- toolset: clang
7984
compiler: clang++-9
8085
cxxstd: "14,17"
81-
os: ubuntu-20.04
86+
os: ubuntu-latest
87+
container: ubuntu:20.04
8288
install: clang-9
8389
- toolset: clang
8490
compiler: clang++-10
8591
cxxstd: "14,17"
86-
os: ubuntu-20.04
92+
os: ubuntu-latest
93+
container: ubuntu:20.04
94+
install: clang-10
8795
- toolset: clang
8896
cxxstd: "14,17"
8997
os: macos-13

0 commit comments

Comments
 (0)