From 2ce143e0617c5f756e11389fe8b818009407f2df Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 15 Dec 2024 19:54:29 +0200 Subject: [PATCH 1/2] Update ci.yml --- .github/workflows/ci.yml | 65 +++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9770f3..b5b3191 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,18 +19,18 @@ jobs: include: - toolset: gcc-4.8 cxxstd: "11" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-4.8 - toolset: gcc-5 cxxstd: "11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-5 - toolset: gcc-6 cxxstd: "11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: g++-6 - toolset: gcc-7 cxxstd: "11,14,17" @@ -49,34 +49,38 @@ jobs: install: g++-10 - toolset: gcc-11 cxxstd: "11,14,17,2a" - os: ubuntu-20.04 - install: g++-11 + os: ubuntu-22.04 - toolset: gcc-12 cxxstd: "11,14,17,20,2b" os: ubuntu-22.04 install: g++-12 - toolset: gcc-13 cxxstd: "11,14,17,20,2b" + container: ubuntu:24.04 os: ubuntu-latest - container: ubuntu:23.04 install: g++-13 + - toolset: gcc-14 + cxxstd: "11,14,17,20,2b" + container: ubuntu:24.04 + os: ubuntu-latest + install: g++-14 - toolset: clang compiler: clang++-3.9 cxxstd: "11,14" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-3.9 - toolset: clang compiler: clang++-4.0 cxxstd: "11,14" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-4.0 - toolset: clang compiler: clang++-5.0 cxxstd: "11,14,1z" - os: ubuntu-latest container: ubuntu:18.04 + os: ubuntu-latest install: clang-5.0 - toolset: clang compiler: clang++-6.0 @@ -131,18 +135,36 @@ jobs: - toolset: clang compiler: clang++-16 cxxstd: "11,14,17,20,2b" + container: ubuntu:24.04 os: ubuntu-latest - container: ubuntu:23.04 install: clang-16 - toolset: clang - cxxstd: "11,14,17,2a" - os: macos-11 - - toolset: clang + compiler: clang++-17 cxxstd: "11,14,17,20,2b" - os: macos-12 + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-17 + - toolset: clang + compiler: clang++-18 + cxxstd: "11,14,17,20,2b" + container: ubuntu:24.04 + os: ubuntu-latest + install: clang-18 + - toolset: clang + compiler: clang++-19 + cxxstd: "11,14,17,20,2b" + container: ubuntu:24.10 + os: ubuntu-latest + install: clang-19 - toolset: clang cxxstd: "11,14,17,20,2b" os: macos-13 + - toolset: clang + cxxstd: "11,14,17,20,2b" + os: macos-14 + - toolset: clang + cxxstd: "11,14,17,20,2b" + os: macos-15 runs-on: ${{matrix.os}} container: ${{matrix.container}} @@ -264,9 +286,10 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - - os: macos-12 + - os: ubuntu-24.04 - os: macos-13 + - os: macos-14 + - os: macos-15 runs-on: ${{matrix.os}} @@ -312,9 +335,10 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - - os: macos-12 + - os: ubuntu-24.04 - os: macos-13 + - os: macos-14 + - os: macos-15 runs-on: ${{matrix.os}} @@ -370,9 +394,10 @@ jobs: include: - os: ubuntu-20.04 - os: ubuntu-22.04 - - os: macos-11 - - os: macos-12 + - os: ubuntu-24.04 - os: macos-13 + - os: macos-14 + - os: macos-15 runs-on: ${{matrix.os}} From 426e7505cdca6356baca998e9e30fb148e3a78d5 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 15 Dec 2024 20:05:50 +0200 Subject: [PATCH 2/2] Apply Node20 workaround --- .github/workflows/ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5b3191..8a066c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,20 +167,32 @@ jobs: os: macos-15 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: - - 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 + + - name: Install nodejs20glibc2.17 + if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }} + run: | + curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz + tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217 + ldd /__e/node20/bin/node + + - uses: actions/checkout@v4 - name: Install packages if: matrix.install