Skip to content

Commit 2935343

Browse files
committed
Update ci.yml
1 parent 8ac9311 commit 2935343

1 file changed

Lines changed: 35 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ jobs:
1919
include:
2020
- toolset: gcc-5
2121
cxxstd: "03,11,14,1z"
22-
os: ubuntu-18.04
22+
os: ubuntu-latest
23+
container: ubuntu:18.04
2324
install: g++-5
2425
- toolset: gcc-6
2526
cxxstd: "03,11,14,1z"
26-
os: ubuntu-18.04
27+
os: ubuntu-latest
28+
container: ubuntu:18.04
2729
install: g++-6
2830
- toolset: gcc-7
2931
cxxstd: "03,11,14,17"
@@ -51,27 +53,30 @@ jobs:
5153
- toolset: clang
5254
compiler: clang++-3.9
5355
cxxstd: "03,11,14"
54-
os: ubuntu-18.04
56+
os: ubuntu-latest
57+
container: ubuntu:18.04
5558
install: clang-3.9
5659
- toolset: clang
5760
compiler: clang++-4.0
5861
cxxstd: "03,11,14"
59-
os: ubuntu-18.04
62+
os: ubuntu-latest
63+
container: ubuntu:18.04
6064
install: clang-4.0
6165
- toolset: clang
6266
compiler: clang++-5.0
6367
cxxstd: "03,11,14,1z"
64-
os: ubuntu-18.04
68+
os: ubuntu-latest
69+
container: ubuntu:18.04
6570
install: clang-5.0
6671
- toolset: clang
6772
compiler: clang++-6.0
6873
cxxstd: "03,11,14,17"
69-
os: ubuntu-18.04
74+
os: ubuntu-20.04
7075
install: clang-6.0
7176
- toolset: clang
7277
compiler: clang++-7
7378
cxxstd: "03,11,14,17"
74-
os: ubuntu-18.04
79+
os: ubuntu-20.04
7580
install: clang-7
7681
- toolset: clang
7782
compiler: clang++-8
@@ -108,15 +113,29 @@ jobs:
108113
- toolset: clang
109114
cxxstd: "03,11,14,17,2a"
110115
os: macos-11
116+
- toolset: clang
117+
cxxstd: "03,11,14,17,20,2b"
118+
os: macos-12
111119

112120
runs-on: ${{matrix.os}}
121+
container: ${{matrix.container}}
122+
123+
defaults:
124+
run:
125+
shell: bash
113126

114127
steps:
115-
- uses: actions/checkout@v2
128+
- uses: actions/checkout@v3
129+
130+
- name: Setup container environment
131+
if: matrix.container
132+
run: |
133+
apt-get update
134+
apt-get -y install sudo python git g++
116135
117136
- name: Install packages
118137
if: matrix.install
119-
run: sudo apt install ${{matrix.install}}
138+
run: sudo apt-get -y install ${{matrix.install}}
120139

121140
- name: Setup Boost
122141
run: |
@@ -179,7 +198,7 @@ jobs:
179198
runs-on: ${{matrix.os}}
180199

181200
steps:
182-
- uses: actions/checkout@v2
201+
- uses: actions/checkout@v3
183202

184203
- name: Setup Boost
185204
shell: cmd
@@ -214,15 +233,15 @@ jobs:
214233
fail-fast: false
215234
matrix:
216235
include:
217-
- os: ubuntu-18.04
218236
- os: ubuntu-20.04
219237
- os: ubuntu-22.04
220238
- os: macos-11
239+
- os: macos-12
221240

222241
runs-on: ${{matrix.os}}
223242

224243
steps:
225-
- uses: actions/checkout@v2
244+
- uses: actions/checkout@v3
226245

227246
- name: Install packages
228247
if: matrix.install
@@ -261,15 +280,15 @@ jobs:
261280
fail-fast: false
262281
matrix:
263282
include:
264-
- os: ubuntu-18.04
265283
- os: ubuntu-20.04
266284
- os: ubuntu-22.04
267285
- os: macos-11
286+
- os: macos-12
268287

269288
runs-on: ${{matrix.os}}
270289

271290
steps:
272-
- uses: actions/checkout@v2
291+
- uses: actions/checkout@v3
273292

274293
- name: Install packages
275294
if: matrix.install
@@ -318,15 +337,15 @@ jobs:
318337
fail-fast: false
319338
matrix:
320339
include:
321-
- os: ubuntu-18.04
322340
- os: ubuntu-20.04
323341
- os: ubuntu-22.04
324342
- os: macos-11
343+
- os: macos-12
325344

326345
runs-on: ${{matrix.os}}
327346

328347
steps:
329-
- uses: actions/checkout@v2
348+
- uses: actions/checkout@v3
330349

331350
- name: Install packages
332351
if: matrix.install

0 commit comments

Comments
 (0)