From 6b735c4c03a620103a057bc786be510018e3c82e Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sat, 28 Sep 2024 12:25:38 +0200 Subject: [PATCH 1/2] Bump actions/checkout to v4 --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89207f0..449b20a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: Formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Formatting uses: DoozyX/clang-format-lint-action@v0.13 with: @@ -74,7 +74,7 @@ jobs: apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ git cmake git config --global pack.threads 0 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary' fetch-depth: ${{ matrix.coverage && '0' || '1' }} @@ -86,7 +86,7 @@ jobs: path: boost-root key: boost-${{matrix.boostBranch}} - name: Checkout Boost - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: boostorg/boost ref: ${{matrix.boostBranch}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e66080b..2666c20 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,8 @@ jobs: BOOST_VERSION: 1.71.0 BOOST_ROOT: ${{github.workspace}}/dependencies/boost steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: boostorg/boost ref: boost-${{env.BOOST_VERSION}} From 80f8cc5e4981c2588d41406f5d67d23a07fd513e Mon Sep 17 00:00:00 2001 From: Mathieu Champlon Date: Sat, 28 Sep 2024 12:42:25 +0200 Subject: [PATCH 2/2] Test more recent compiler and boost versions --- .github/workflows/ci.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 449b20a..f84ed28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,17 +42,19 @@ jobs: matrix: include: # Linux, gcc - - { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - - { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - - { compiler: gcc-12,cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 } - + - { compiler: gcc-7, cxxstd: '14,17', boostBranch: boost-1.86.0, os: ubuntu-20.04 } + - { compiler: gcc-10, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-22.04 } + - { compiler: gcc-12, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 } + - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 } + - { compiler: gcc-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 } + # Linux, clang - - { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - - { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' } - - { compiler: clang-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 } + - { compiler: clang-14, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 } + - { compiler: clang-18, cxxstd: '14,17,20', boostBranch: boost-1.86.0, os: ubuntu-24.04 } + - { compiler: clang-18, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-24.04 } - { name: Collect coverage, coverage: yes, - compiler: gcc-8, cxxstd: '14', boostBranch: master, os: ubuntu-20.04 } + compiler: gcc-8, cxxstd: '14', boostBranch: boost-1.86.0, os: ubuntu-20.04 } timeout-minutes: 120 runs-on: ${{matrix.os}} @@ -127,11 +129,7 @@ jobs: - name: Boost build run: | - if [[ "${{matrix.boostBranch}}" == "master" ]]; then - B2_FLAGS="cxxstd=${{matrix.cxxstd}}" - else - B2_FLAGS="cxxflags=-std=c++${{matrix.cxxstd}}" - fi + B2_FLAGS="cxxstd=${{matrix.cxxstd}}" if [[ "${{matrix.coverage}}" == "yes" ]]; then B2_FLAGS="$B2_FLAGS cxxflags=--coverage linkflags=--coverage" fi