Skip to content

Commit 7c21f2d

Browse files
committed
Update ci.yml
1 parent 5fc86f6 commit 7c21f2d

File tree

1 file changed

+51
-7
lines changed

1 file changed

+51
-7
lines changed

.github/workflows/ci.yml

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,26 @@ jobs:
1919
include:
2020
- toolset: gcc-4.8
2121
cxxstd: "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: "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: "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: "11,14,17"
34-
os: ubuntu-18.04
37+
os: ubuntu-20.04
38+
install: g++-7
3539
- toolset: gcc-8
3640
cxxstd: "11,14,17,2a"
37-
os: ubuntu-18.04
41+
os: ubuntu-20.04
3842
install: g++-8
3943
- toolset: gcc-9
4044
cxxstd: "11,14,17,2a"
@@ -50,6 +54,11 @@ jobs:
5054
cxxstd: "11,14,17,20,2b"
5155
os: ubuntu-22.04
5256
install: g++-12
57+
- toolset: gcc-13
58+
cxxstd: "11,14,17,20,2b"
59+
os: ubuntu-latest
60+
container: ubuntu:23.04
61+
install: g++-13
5362
- toolset: clang
5463
compiler: clang++-12
5564
cxxstd: "11,14,17,2a"
@@ -64,21 +73,48 @@ jobs:
6473
cxxstd: "11,14,17,20,2b"
6574
os: ubuntu-22.04
6675
install: clang-14
76+
- toolset: clang
77+
compiler: clang++-15
78+
cxxstd: "11,14,17,20,2b"
79+
os: ubuntu-22.04
80+
install: clang-15
81+
- toolset: clang
82+
compiler: clang++-16
83+
cxxstd: "11,14,17,20,2b"
84+
os: ubuntu-latest
85+
container: ubuntu:23.04
86+
install: clang-16
6787
- toolset: clang
6888
cxxstd: "11,14,17,20,2b"
6989
os: macos-11
7090
- toolset: clang
7191
cxxstd: "11,14,17,20,2b"
7292
os: macos-12
93+
- toolset: clang
94+
cxxstd: "11,14,17,20,2b"
95+
os: macos-13
7396

7497
runs-on: ${{matrix.os}}
98+
container: ${{matrix.container}}
99+
100+
defaults:
101+
run:
102+
shell: bash
75103

76104
steps:
77105
- uses: actions/checkout@v3
78106

107+
- name: Setup container environment
108+
if: matrix.container
109+
run: |
110+
apt-get update
111+
apt-get -y install sudo python3 git g++
112+
79113
- name: Install packages
80114
if: matrix.install
81-
run: sudo apt install ${{matrix.install}}
115+
run: |
116+
sudo apt-get update
117+
sudo apt-get -y install ${{matrix.install}}
82118
83119
- name: Setup Boost
84120
run: |
@@ -98,7 +134,7 @@ jobs:
98134
cd boost-root
99135
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
100136
git submodule update --init tools/boostdep
101-
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
137+
python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
102138
./bootstrap.sh
103139
./b2 -d0 headers
104140
@@ -192,6 +228,10 @@ jobs:
192228
shared: OFF
193229
- os: macos-12
194230
shared: ON
231+
- os: macos-13
232+
shared: OFF
233+
- os: macos-13
234+
shared: ON
195235

196236
runs-on: ${{matrix.os}}
197237

@@ -251,6 +291,10 @@ jobs:
251291
shared: OFF
252292
- os: macos-12
253293
shared: ON
294+
- os: macos-13
295+
shared: OFF
296+
- os: macos-13
297+
shared: ON
254298

255299
runs-on: ${{matrix.os}}
256300

0 commit comments

Comments
 (0)