From 47ded14274241101423c5ce337a0186f2cd5b02d Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 4 May 2026 15:26:33 -0400 Subject: [PATCH 1/4] Remove ppa ubuntu-toolchain-r --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 288b00800..91bb785a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,6 @@ jobs: fetch-depth: '0' - name: Set TOOLSET run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV - - name: Add repository - run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages run: sudo apt install g++-11 g++-12 g++-13 - name: Checkout main boost @@ -75,8 +73,6 @@ jobs: fetch-depth: '0' - name: Set TOOLSET run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV - - name: Add repository - run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages run: sudo apt install libicu-dev - name: Test @@ -95,8 +91,6 @@ jobs: fetch-depth: '0' - name: Set TOOLSET run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV - - name: Add repository - run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages run: sudo apt install clang-15 - name: Checkout main boost @@ -168,8 +162,6 @@ jobs: fetch-depth: '0' - name: Set TOOLSET run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV - - name: Add repository - run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - name: Install packages run: sudo apt install clang-16 clang-17 clang-18 - name: Checkout main boost From be7c83f58ed13497e5f6dbc75cfc78291dbb6895 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 4 May 2026 15:30:35 -0400 Subject: [PATCH 2/4] 22.04 doesn't have gcc13 --- .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 91bb785a6..3e1b96607 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ env: jobs: ubuntu-jammy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: From ce2a2b62ebb4bd7a130fc08c7cb3abb3120e6785 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 4 May 2026 15:31:38 -0400 Subject: [PATCH 3/4] 22.04 doesn't have clang-18 --- .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 3e1b96607..79a6f38e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,7 @@ jobs: run: ../../../b2 toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER working-directory: ../boost-root/libs/regex/test ubuntu-jammy-clang-18-modules: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v6 with: From 08f5b88d8dcd7bbe433f4a8ae6acd942b34be928 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 4 May 2026 16:09:12 -0400 Subject: [PATCH 4/4] Add concurrency to kill on push --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79a6f38e2..62e8a61a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,10 @@ on: release: types: [published, created, edited] +concurrency: + group: ${{format('{0}:{1}', github.repository, github.ref)}} + cancel-in-progress: true + env: UBSAN_OPTIONS: print_stacktrace=1