Skip to content

Commit f10ddd6

Browse files
committed
Update ci.yml
1 parent 4cf829b commit f10ddd6

1 file changed

Lines changed: 43 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,26 @@ jobs:
1919
include:
2020
- toolset: gcc-4.8
2121
cxxstd: "03,11"
22-
os: ubuntu-18.04
22+
os: ubuntu-latest
23+
container: ubuntu:18.04
2324
install: g++-4.8
2425
- toolset: gcc-5
2526
cxxstd: "03,11,14,1z"
26-
os: ubuntu-18.04
27+
os: ubuntu-latest
28+
container: ubuntu:18.04
2729
install: g++-5
2830
- toolset: gcc-6
2931
cxxstd: "03,11,14,1z"
30-
os: ubuntu-18.04
32+
os: ubuntu-latest
33+
container: ubuntu:18.04
3134
install: g++-6
3235
- toolset: gcc-7
3336
cxxstd: "03,11,14,17"
34-
os: ubuntu-18.04
37+
os: ubuntu-20.04
38+
install: g++-7
3539
- toolset: gcc-8
3640
cxxstd: "03,11,14,17,2a"
37-
os: ubuntu-18.04
41+
os: ubuntu-20.04
3842
install: g++-8
3943
- toolset: gcc-9
4044
cxxstd: "03,11,14,17,2a"
@@ -54,27 +58,30 @@ jobs:
5458
- toolset: clang
5559
compiler: clang++-3.9
5660
cxxstd: "03,11,14"
57-
os: ubuntu-18.04
61+
os: ubuntu-latest
62+
container: ubuntu:18.04
5863
install: clang-3.9
5964
- toolset: clang
6065
compiler: clang++-4.0
6166
cxxstd: "03,11,14"
62-
os: ubuntu-18.04
67+
os: ubuntu-latest
68+
container: ubuntu:18.04
6369
install: clang-4.0
6470
- toolset: clang
6571
compiler: clang++-5.0
6672
cxxstd: "03,11,14,1z"
67-
os: ubuntu-18.04
73+
os: ubuntu-latest
74+
container: ubuntu:18.04
6875
install: clang-5.0
6976
- toolset: clang
7077
compiler: clang++-6.0
7178
cxxstd: "03,11,14,17"
72-
os: ubuntu-18.04
79+
os: ubuntu-20.04
7380
install: clang-6.0
7481
- toolset: clang
7582
compiler: clang++-7
7683
cxxstd: "03,11,14,17"
77-
os: ubuntu-18.04
84+
os: ubuntu-20.04
7885
install: clang-7
7986
- toolset: clang
8087
compiler: clang++-8
@@ -111,18 +118,37 @@ jobs:
111118
cxxstd: "03,11,14,17,20,2b"
112119
os: ubuntu-22.04
113120
install: clang-14
121+
- toolset: clang
122+
compiler: clang++-15
123+
cxxstd: "03,11,14,17,20,2b"
124+
os: ubuntu-22.04
125+
install: clang-15
114126
- toolset: clang
115127
cxxstd: "03,11,14,17,2a"
116128
os: macos-11
129+
- toolset: clang
130+
cxxstd: "03,11,14,17,20,2b"
131+
os: macos-12
117132

118133
runs-on: ${{matrix.os}}
134+
container: ${{matrix.container}}
135+
136+
defaults:
137+
run:
138+
shell: bash
119139

120140
steps:
121141
- uses: actions/checkout@v3
122142

143+
- name: Setup container environment
144+
if: matrix.container
145+
run: |
146+
apt-get update
147+
apt-get -y install sudo python git g++
148+
123149
- name: Install packages
124150
if: matrix.install
125-
run: sudo apt install ${{matrix.install}}
151+
run: sudo apt-get -y install ${{matrix.install}}
126152

127153
- name: Setup Boost
128154
run: |
@@ -220,10 +246,10 @@ jobs:
220246
fail-fast: false
221247
matrix:
222248
include:
223-
- os: ubuntu-18.04
224249
- os: ubuntu-20.04
225250
- os: ubuntu-22.04
226251
- os: macos-11
252+
- os: macos-12
227253

228254
runs-on: ${{matrix.os}}
229255

@@ -232,7 +258,7 @@ jobs:
232258

233259
- name: Install packages
234260
if: matrix.install
235-
run: sudo apt install ${{matrix.install}}
261+
run: sudo apt-get -y install ${{matrix.install}}
236262

237263
- name: Setup Boost
238264
run: |
@@ -267,10 +293,10 @@ jobs:
267293
fail-fast: false
268294
matrix:
269295
include:
270-
- os: ubuntu-18.04
271296
- os: ubuntu-20.04
272297
- os: ubuntu-22.04
273298
- os: macos-11
299+
- os: macos-12
274300

275301
runs-on: ${{matrix.os}}
276302

@@ -279,7 +305,7 @@ jobs:
279305

280306
- name: Install packages
281307
if: matrix.install
282-
run: sudo apt install ${{matrix.install}}
308+
run: sudo apt-get -y install ${{matrix.install}}
283309

284310
- name: Setup Boost
285311
run: |
@@ -324,10 +350,10 @@ jobs:
324350
fail-fast: false
325351
matrix:
326352
include:
327-
- os: ubuntu-18.04
328353
- os: ubuntu-20.04
329354
- os: ubuntu-22.04
330355
- os: macos-11
356+
- os: macos-12
331357

332358
runs-on: ${{matrix.os}}
333359

@@ -336,7 +362,7 @@ jobs:
336362

337363
- name: Install packages
338364
if: matrix.install
339-
run: sudo apt install ${{matrix.install}}
365+
run: sudo apt-get -y install ${{matrix.install}}
340366

341367
- name: Setup Boost
342368
run: |

0 commit comments

Comments
 (0)