From 9fa56ae04e8eee469e0796b87cf78b215e3a83b4 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 7 Dec 2024 19:43:41 +0100 Subject: [PATCH 1/6] 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 92d8c80..dc3aafb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,24 +180,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 e9dc00e009b2a76ba4083501d646956d7cd0a54f Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 13:10:47 +0100 Subject: [PATCH 2/6] 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 dc3aafb..4190b69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,7 +198,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 d9d1037bb0481ae8ce022674d6b06749564bffb0 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 14:41:53 +0100 Subject: [PATCH 3/6] 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 4190b69..cc1d3e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,8 +73,7 @@ jobs: address-model: 32,64 - toolset: gcc-13 cxxstd: "11,14,17,20,2b" - container: ubuntu:23.04 - os: ubuntu-latest + os: ubuntu-24.04 install: g++-13-multilib address-model: 32,64 - toolset: gcc-14 @@ -154,14 +153,12 @@ jobs: - toolset: clang compiler: clang++-16 cxxstd: "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: "11,14,17,20,2b" - container: ubuntu:23.10 - os: ubuntu-latest + os: ubuntu-24.04 install: clang-17 - toolset: clang compiler: clang++-18 @@ -169,9 +166,6 @@ jobs: container: ubuntu:24.04 os: ubuntu-latest install: clang-18 - - toolset: clang - cxxstd: "11,14,17,20,2b" - os: macos-12 - toolset: clang cxxstd: "11,14,17,20,2b" os: macos-13 From bca79aa164e054bfc32d423edb165858fa0ccf19 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 20:42:27 +0100 Subject: [PATCH 4/6] 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 cc1d3e3..aa1f00d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -302,7 +302,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 @@ -350,7 +349,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 @@ -408,7 +406,6 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-12 - os: macos-13 - os: macos-14 From ddb118695eab4fc6e297fdfa70361ab061c85e58 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 20:56:44 +0100 Subject: [PATCH 5/6] 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 aa1f00d..1dd6584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,7 +189,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 From a69c50b53140215cab7e5b9c76d8a869b4d511b3 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 10 Dec 2024 10:12:39 +0100 Subject: [PATCH 6/6] GHA: Remove C++2b test from clang-17 on ubuntu-24.04 --- .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 1dd6584..f8bf464 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: install: clang-16 - toolset: clang compiler: clang++-17 - cxxstd: "11,14,17,20,2b" + cxxstd: "11,14,17,20" os: ubuntu-24.04 install: clang-17 - toolset: clang