From ab86cf2b3af0e86feb499634b0f7782f4b3364a5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sat, 7 Dec 2024 19:42:53 +0100 Subject: [PATCH 1/3] 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 449a5f3..5e4f6d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -164,24 +164,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 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 + fi + + - uses: actions/checkout@v4 - name: Install packages if: matrix.install From 3b6bac1935b9af924676803b5d56f9337b687c73 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Sun, 8 Dec 2024 14:43:35 +0100 Subject: [PATCH 2/3] 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 5e4f6d9..2e2c875 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,8 +56,7 @@ jobs: install: g++-12 - toolset: gcc-13 cxxstd: "11,14,17,20,2b" - container: ubuntu:23.04 - os: ubuntu-latest + os: ubuntu-24.04 install: g++-13 - toolset: gcc-14 cxxstd: "11,14,17,20,2b" @@ -138,14 +137,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 @@ -153,9 +150,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 5caa033775a89e979cca1cb5ba07821b77a926f5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 10 Dec 2024 10:13:56 +0100 Subject: [PATCH 3/3] Remove macos-12 from GHA --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e2c875..71182ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -282,7 +282,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ] + os: [ ubuntu-20.04, ubuntu-22.04, macos-13, macos-14 ] shared: [ OFF, ON ] runs-on: ${{matrix.os}} @@ -326,7 +326,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ] + os: [ ubuntu-20.04, ubuntu-22.04, macos-13, macos-14 ] shared: [ OFF, ON ] runs-on: ${{matrix.os}} @@ -386,7 +386,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, macos-14 ] + os: [ ubuntu-20.04, ubuntu-22.04, macos-13, macos-14 ] shared: [ OFF, ON ] runs-on: ${{matrix.os}}