From 08cc52c43ff346c3ce06e5244c75ed77add5edef Mon Sep 17 00:00:00 2001 From: Bronek Kozicki Date: Tue, 5 May 2026 16:33:10 +0100 Subject: [PATCH 1/2] Add clang version 22 to debian image --- .github/workflows/debian.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index ca29335..e3f179b 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -31,7 +31,7 @@ env: FALLBACK_CLANG: 16 CCACHE_VERSION: 4.12.2 CMAKE_VERSION: 4.2.1 - CONAN_VERSION: 2.24.0 + CONAN_VERSION: 2.28.1 GCOVR_VERSION: 8.3 MOLD_VERSION: 2.40.4 RUST_VERSION: 1.91.1 @@ -99,6 +99,9 @@ jobs: - release: trixie compiler_name: clang compiler_version: 21 + - release: trixie + compiler_name: clang + compiler_version: 22 runs-on: ${{ matrix.architecture.runner }} permissions: packages: write @@ -240,6 +243,9 @@ jobs: - release: trixie compiler_name: clang compiler_version: 21 + - release: trixie + compiler_name: clang + compiler_version: 22 runs-on: ubuntu-24.04 needs: - build From 00c2dee426b4b46fd1fc9756915068b8882804eb Mon Sep 17 00:00:00 2001 From: Bronek Kozicki Date: Tue, 5 May 2026 16:48:04 +0100 Subject: [PATCH 2/2] Conan version bump for all distros --- .github/workflows/rhel.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- docker/debian/README.md | 6 +++--- docker/rhel/README.md | 4 ++-- docker/ubuntu/README.md | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rhel.yml b/.github/workflows/rhel.yml index a9e5d7c..0de731c 100644 --- a/.github/workflows/rhel.yml +++ b/.github/workflows/rhel.yml @@ -29,7 +29,7 @@ env: BUILDKIT_PROGRESS: plain CCACHE_VERSION: 4.12.2 CMAKE_VERSION: 4.2.1 - CONAN_VERSION: 2.24.0 + CONAN_VERSION: 2.28.1 GCOVR_VERSION: 8.3 MOLD_VERSION: 2.40.4 RUST_VERSION: 1.91.1 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a96b5ed..efd7004 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -31,7 +31,7 @@ env: FALLBACK_CLANG: 16 CCACHE_VERSION: 4.12.2 CMAKE_VERSION: 4.2.1 - CONAN_VERSION: 2.24.0 + CONAN_VERSION: 2.28.1 GCOVR_VERSION: 8.3 MOLD_VERSION: 2.40.4 RUST_VERSION: 1.91.1 diff --git a/docker/debian/README.md b/docker/debian/README.md index 0cf16e6..e0d6186 100644 --- a/docker/debian/README.md +++ b/docker/debian/README.md @@ -40,7 +40,7 @@ DEBIAN_VERSION=bookworm GCC_VERSION=12 CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 @@ -74,7 +74,7 @@ BASE_IMAGE=ghcr.io/xrplf/ci/gcc:${GCC_VERSION}-bullseye # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 @@ -110,7 +110,7 @@ CLANG_VERSION=17 # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 diff --git a/docker/rhel/README.md b/docker/rhel/README.md index 50f0086..3483763 100644 --- a/docker/rhel/README.md +++ b/docker/rhel/README.md @@ -30,7 +30,7 @@ GCC_VERSION=12 # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 @@ -63,7 +63,7 @@ RHEL_VERSION=10 # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 diff --git a/docker/ubuntu/README.md b/docker/ubuntu/README.md index e2ab815..51732ee 100644 --- a/docker/ubuntu/README.md +++ b/docker/ubuntu/README.md @@ -29,7 +29,7 @@ GCC_VERSION=14 # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1 @@ -65,7 +65,7 @@ CLANG_VERSION=18 # The versions of the tools to use. CCACHE_VERSION=4.12.2 CMAKE_VERSION=4.2.1 -CONAN_VERSION=2.24.0 +CONAN_VERSION=2.28.1 GCOVR_VERSION=8.3 MOLD_VERSION=2.40.4 RUST_VERSION=1.91.1