Skip to content

Commit 2e60d0f

Browse files
committed
GHA update
1 parent 6633c36 commit 2e60d0f

File tree

1 file changed

+36
-35
lines changed

1 file changed

+36
-35
lines changed

.github/workflows/ci.yml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,57 +21,44 @@ jobs:
2121
cxxstd: "11,14,1z"
2222
os: ubuntu-latest
2323
container: ubuntu:18.04
24-
install: g++-5-multilib
25-
address-model: 32,64
24+
install: g++-5
2625
- toolset: gcc-6
2726
cxxstd: "11,14,1z"
2827
os: ubuntu-latest
2928
container: ubuntu:18.04
30-
install: g++-6-multilib
31-
address-model: 32,64
29+
install: g++-6
3230
- toolset: gcc-7
33-
cxxstd: "11,14"
31+
cxxstd: "11,14,17"
3432
os: ubuntu-latest
3533
container: ubuntu:18.04
36-
install: g++-7-multilib
37-
address-model: 32,64
3834
- toolset: gcc-8
3935
cxxstd: "11,14,17,2a"
4036
os: ubuntu-20.04
41-
install: g++-8-multilib
42-
address-model: 32,64
37+
install: g++-8
4338
- toolset: gcc-9
4439
cxxstd: "11,14,17,2a"
4540
os: ubuntu-20.04
46-
install: g++-9-multilib
47-
address-model: 32,64
4841
- toolset: gcc-10
4942
cxxstd: "11,14,17,2a"
5043
os: ubuntu-20.04
51-
install: g++-10-multilib
52-
address-model: 32,64
44+
install: g++-10
5345
- toolset: gcc-11
54-
cxxstd: "11,14,17,20"
46+
cxxstd: "11,14,17,2a"
5547
os: ubuntu-22.04
56-
install: g++-11-multilib
57-
address-model: 32,64
5848
- toolset: gcc-12
5949
cxxstd: "11,14,17,20,2b"
6050
os: ubuntu-22.04
61-
install: g++-12-multilib
62-
address-model: 32,64
51+
install: g++-12
6352
- toolset: gcc-13
6453
cxxstd: "11,14,17,20,2b"
6554
os: ubuntu-latest
66-
container: ubuntu:23.04
67-
install: g++-13-multilib
68-
address-model: 32,64
55+
container: ubuntu:24.04
56+
install: g++-13
6957
- toolset: gcc-14
7058
cxxstd: "11,14,17,20,2b"
7159
os: ubuntu-latest
7260
container: ubuntu:24.04
73-
install: g++-14-multilib
74-
address-model: 32,64
61+
install: g++-14
7562
- toolset: clang
7663
compiler: clang++-3.9
7764
cxxstd: "11,14"
@@ -107,7 +94,7 @@ jobs:
10794
install: clang-8
10895
- toolset: clang
10996
compiler: clang++-9
110-
cxxstd: "11,14,17,2a"
97+
cxxstd: "11,14,17"
11198
os: ubuntu-20.04
11299
install: clang-9
113100
- toolset: clang
@@ -143,13 +130,13 @@ jobs:
143130
- toolset: clang
144131
compiler: clang++-16
145132
cxxstd: "11,14,17,20,2b"
146-
container: ubuntu:23.04
133+
container: ubuntu:24.04
147134
os: ubuntu-latest
148135
install: clang-16
149136
- toolset: clang
150137
compiler: clang++-17
151138
cxxstd: "11,14,17,20,2b"
152-
container: ubuntu:23.10
139+
container: ubuntu:24.04
153140
os: ubuntu-latest
154141
install: clang-17
155142
- toolset: clang
@@ -159,34 +146,48 @@ jobs:
159146
os: ubuntu-latest
160147
install: clang-18
161148
- toolset: clang
149+
compiler: clang++-19
162150
cxxstd: "11,14,17,20,2b"
163-
os: macos-12
151+
container: ubuntu:24.10
152+
os: ubuntu-latest
153+
install: clang-19
164154
- toolset: clang
165155
cxxstd: "11,14,17,20,2b"
166156
os: macos-13
167157
- toolset: clang
168158
cxxstd: "11,14,17,20,2b"
169159
os: macos-14
160+
- toolset: clang
161+
cxxstd: "11,14,17,20,2b"
162+
os: macos-15
170163

171164
runs-on: ${{matrix.os}}
172-
container: ${{matrix.container}}
165+
166+
container:
167+
image: ${{matrix.container}}
168+
volumes:
169+
- /node20217:/node20217:rw,rshared
170+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
173171

174172
defaults:
175173
run:
176174
shell: bash
177175

178176
steps:
179-
- name: Enable Node 16
180-
run: |
181-
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
182-
183-
- uses: actions/checkout@v3
184-
185177
- name: Setup container environment
186178
if: matrix.container
187179
run: |
188180
apt-get update
189-
apt-get -y install sudo python3 git g++
181+
apt-get -y install sudo python3 git g++ curl xz-utils
182+
183+
- name: Install nodejs20glibc2.17
184+
if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
185+
run: |
186+
curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
187+
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
188+
ldd /__e/node20/bin/node
189+
190+
- uses: actions/checkout@v4
190191

191192
- name: Install packages
192193
if: matrix.install

0 commit comments

Comments
 (0)