From df21131b100e6d50b28d2c5cfc34d22f18025dba Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 7 Dec 2024 19:42:53 +0100 Subject: [PATCH 1/5] Fix node 20 issue on GHA CI --- .github/workflows/ci.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90eacf0..e6c90c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,24 +171,28 @@ jobs: os: macos-14 runs-on: ${{matrix.os}} - container: ${{matrix.container}} + container: + image: ${{matrix.container}} + volumes: + - /node20217:/node20217:rw,rshared + - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }} defaults: run: shell: bash steps: - - name: Enable Node 16 - run: | - echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV - - - uses: actions/checkout@v3 - - name: Setup container environment if: matrix.container run: | apt-get update - apt-get -y install sudo python3 git g++ + apt-get -y install sudo python3 git g++ curl + if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then + # Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590 + curl -sL https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217 + fi + + - uses: actions/checkout@v4 - name: Install packages if: matrix.install From b45bfadd63b8e8311ea9dc53fedd789c6329522c Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 13:11:28 +0100 Subject: [PATCH 2/5] Use hosted node --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6c90c1..9c8f013 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,7 +189,7 @@ jobs: apt-get -y install sudo python3 git g++ curl if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then # Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590 - curl -sL https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217 + 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 fi - uses: actions/checkout@v4 From fb0b1df64e1bb44aa27c66e1b516f7cdc4dedcda Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 14:43:38 +0100 Subject: [PATCH 3/5] Update containers --- .github/workflows/ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c8f013..0510b43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,8 +67,7 @@ jobs: address-model: 32,64 - toolset: gcc-13 cxxstd: "03,11,14,17,20,2b" - os: ubuntu-latest - container: ubuntu:23.04 + os: ubuntu-24.04 install: g++-13-multilib address-model: 32,64 - toolset: gcc-14 @@ -145,14 +144,12 @@ jobs: - toolset: clang compiler: clang++-16 cxxstd: "03,11,14,17,20,2b" - container: ubuntu:23.04 - os: ubuntu-latest + os: ubuntu-24.04 install: clang-16 - toolset: clang compiler: clang++-17 cxxstd: "03,11,14,17,20,2b" - container: ubuntu:23.10 - os: ubuntu-latest + os: ubuntu-24.04 install: clang-17 - toolset: clang compiler: clang++-18 @@ -160,9 +157,6 @@ jobs: container: ubuntu:24.04 os: ubuntu-latest install: clang-18 - - toolset: clang - cxxstd: "03,11,14,17,20,2b" - os: macos-12 - toolset: clang cxxstd: "03,11,14,17,20,2b" os: macos-13 From 8d24ab76bfc2661ef7ef59f621308bbbd28a6c17 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 20:42:48 +0100 Subject: [PATCH 4/5] Remove macos-12 from GHA --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0510b43..29e886d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -293,7 +293,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 @@ -341,7 +340,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 @@ -399,7 +397,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 From 0b71c6e21d75ebf0cfb4cecc97353e857b7792c1 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 20:57:33 +0100 Subject: [PATCH 5/5] Install xz --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29e886d..81a899b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: if: matrix.container run: | apt-get update - apt-get -y install sudo python3 git g++ curl + apt-get -y install sudo python3 git g++ curl xz-utils if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then # Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590 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