Skip to content

Commit 2891b2f

Browse files
authored
Merge pull request #235 from Flamefire/ci
Fix Github Actions
2 parents d4c15cf + 9f8ebdf commit 2891b2f

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: GitHub Actions CI
22

3-
# permit node16 use as a workaround for node20's differing glibc version
4-
env:
5-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
6-
73
on:
84
pull_request:
95
push:
@@ -25,7 +21,7 @@ jobs:
2521
buildtype: "boost"
2622
packages: ""
2723
packages_to_remove: ""
28-
os: "ubuntu-20.04"
24+
os: ubuntu-latest
2925
container: "ubuntu:16.04"
3026
cxx: "g++"
3127
sources: ""
@@ -37,7 +33,7 @@ jobs:
3733
buildtype: "boost"
3834
packages: "g++-5"
3935
packages_to_remove: ""
40-
os: "ubuntu-20.04"
36+
os: ubuntu-latest
4137
container: "ubuntu:16.04"
4238
cxx: "g++-5"
4339
sources: ""
@@ -49,7 +45,7 @@ jobs:
4945
buildtype: "boost"
5046
packages: "g++-6"
5147
packages_to_remove: ""
52-
os: "ubuntu-20.04"
48+
os: ubuntu-latest
5349
container: "ubuntu:16.04"
5450
cxx: "g++-6"
5551
sources: ""
@@ -61,7 +57,7 @@ jobs:
6157
buildtype: "boost"
6258
packages: "g++-7"
6359
packages_to_remove: ""
64-
os: "ubuntu-20.04"
60+
os: ubuntu-latest
6561
container: "ubuntu:16.04"
6662
cxx: "g++-7"
6763
sources: ""
@@ -73,7 +69,7 @@ jobs:
7369
buildtype: "boost"
7470
packages: "g++-9"
7571
packages_to_remove: ""
76-
os: "ubuntu-20.04"
72+
os: ubuntu-latest
7773
container: "ubuntu:16.04"
7874
cxx: "g++-9"
7975
sources: ""
@@ -94,9 +90,14 @@ jobs:
9490
cxxstd: "11,14,17,20"
9591

9692
runs-on: ${{ matrix.os }}
97-
container: ${{ matrix.container }}
93+
container:
94+
image: ${{matrix.container}}
95+
volumes:
96+
- /node20217:/node20217:rw,rshared
97+
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
9898

9999
steps:
100+
100101
- name: Check if running in container
101102
if: matrix.container != ''
102103
run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
@@ -110,8 +111,10 @@ jobs:
110111
sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
111112
sudo python3 get-pip.py
112113
sudo /usr/local/bin/pip install cmake
114+
# Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590
115+
curl -sL https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217
113116
114-
- uses: actions/checkout@v3
117+
- uses: actions/checkout@v4
115118

116119
- name: linux
117120
shell: bash
@@ -197,7 +200,7 @@ jobs:
197200
- name: "TOOLSET=clang CXXSTD=11,14,17,20 Job 5"
198201
buildtype: "boost"
199202
packages: ""
200-
os: "macos-12"
203+
os: "macos-13"
201204
cxx: "clang++"
202205
sources: ""
203206
llvm_os: ""
@@ -209,7 +212,7 @@ jobs:
209212
runs-on: ${{ matrix.os }}
210213

211214
steps:
212-
- uses: actions/checkout@v3
215+
- uses: actions/checkout@v4
213216

214217
- name: Set DEVELOPER_DIR
215218
if: matrix.xcode_version != ''

0 commit comments

Comments
 (0)