Skip to content

Commit a4159f3

Browse files
authored
Move ubuntu 20.04 runs into containers (#446)
* Move ubuntu 20.04 runs into containers * Fix syntax error
1 parent a5e435d commit a4159f3

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,22 @@ jobs:
7676
- toolset: gcc-9
7777
cxxstd: "17,2a"
7878
address_model: 64
79-
os: ubuntu-20.04
79+
os: ubuntu-latest
80+
container: ubuntu:20.04
8081
install:
8182
- g++-9-multilib
8283
- toolset: gcc-9
8384
cxxstd: "17-gnu,2a-gnu"
8485
address_model: 64
85-
os: ubuntu-20.04
86+
os: ubuntu-latest
87+
container: ubuntu:20.04
8688
install:
8789
- g++-9-multilib
8890
- toolset: gcc-10
8991
cxxstd: "17,20"
9092
address_model: 64
91-
os: ubuntu-20.04
93+
os: ubuntu-latest
94+
container: ubuntu:20.04
9295
install:
9396
- g++-10-multilib
9497
- toolset: gcc-11
@@ -174,13 +177,15 @@ jobs:
174177
- toolset: clang
175178
compiler: clang++-9
176179
cxxstd: "17,2a"
177-
os: ubuntu-20.04
180+
os: ubuntu-latest
181+
container: ubuntu:20.04
178182
install:
179183
- clang-9
180184
- toolset: clang
181185
compiler: clang++-10
182186
cxxstd: "17,20"
183-
os: ubuntu-20.04
187+
os: ubuntu-latest
188+
container: ubuntu:20.04
184189
install:
185190
- clang-10
186191
- toolset: clang
@@ -531,8 +536,8 @@ jobs:
531536
fail-fast: false
532537
matrix:
533538
include:
534-
- { os: ubuntu-20.04, build_shared: ON, build_type: Debug, generator: 'Unix Makefiles' }
535-
- { os: ubuntu-20.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
539+
- { os: ubuntu-22.04, build_shared: ON, build_type: Debug, generator: 'Unix Makefiles' }
540+
- { os: ubuntu-22.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
536541
- { os: windows-2019, build_shared: ON, build_type: Debug, generator: 'Visual Studio 16 2019' }
537542
- { os: windows-2019, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 16 2019' }
538543

0 commit comments

Comments
 (0)