From 7acd719bf7ab7e64a803fe7ca23fff5cbc9a8819 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Wed, 7 Oct 2026 13:08:20 +0000 Subject: [PATCH] build: Use images with Clang 23 except for clang-tidy (#8530) --- .github/scripts/strategy-matrix/linux.json | 2 +- .github/workflows/cargo-audit.yml | 2 +- .github/workflows/publish-docs.yml | 2 +- .github/workflows/reusable-rust.yml | 6 +- .github/workflows/reusable-upload-recipe.yml | 2 +- cmake/XrplCore.cmake | 1 + external/antithesis-sdk/CMakeLists.txt | 2 +- nix/check-tools/nix-ubuntu-amd64.txt | 60 ++++++++++---------- nix/check-tools/nix-ubuntu-arm64.txt | 60 ++++++++++---------- 9 files changed, 69 insertions(+), 68 deletions(-) diff --git a/.github/scripts/strategy-matrix/linux.json b/.github/scripts/strategy-matrix/linux.json index 371355d0c1..b8ea2bb15c 100644 --- a/.github/scripts/strategy-matrix/linux.json +++ b/.github/scripts/strategy-matrix/linux.json @@ -1,5 +1,5 @@ { - "image_tag": "sha-ed96e60", + "image_tag": "sha-3d526d4", "configs": { "ubuntu": [ { diff --git a/.github/workflows/cargo-audit.yml b/.github/workflows/cargo-audit.yml index 86429d27ef..35030cca70 100644 --- a/.github/workflows/cargo-audit.yml +++ b/.github/workflows/cargo-audit.yml @@ -34,7 +34,7 @@ permissions: jobs: audit: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 permissions: contents: read # Needed to open an issue on scheduled failures. diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index b22b79f6f9..c02ececcd5 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -41,7 +41,7 @@ env: jobs: build: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/reusable-rust.yml b/.github/workflows/reusable-rust.yml index 0a0b0031d7..bc44b00f41 100644 --- a/.github/workflows/reusable-rust.yml +++ b/.github/workflows/reusable-rust.yml @@ -28,7 +28,7 @@ permissions: jobs: clippy: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -41,7 +41,7 @@ jobs: coverage: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -70,7 +70,7 @@ jobs: doc: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 diff --git a/.github/workflows/reusable-upload-recipe.yml b/.github/workflows/reusable-upload-recipe.yml index ba7f7b748b..3241bb1d79 100644 --- a/.github/workflows/reusable-upload-recipe.yml +++ b/.github/workflows/reusable-upload-recipe.yml @@ -40,7 +40,7 @@ defaults: jobs: upload: runs-on: ubuntu-latest - container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-ed96e60 + container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-3d526d4 env: REMOTE_NAME: ${{ inputs.remote_name }} CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }} diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index f3713b3b00..d7a490be58 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -330,6 +330,7 @@ if(xrpld) # antithesis_instrumentation.h, which is not exported as INTERFACE target_include_directories( xrpld + SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/external/antithesis-sdk ) endif() diff --git a/external/antithesis-sdk/CMakeLists.txt b/external/antithesis-sdk/CMakeLists.txt index 645b73c530..82868505ce 100644 --- a/external/antithesis-sdk/CMakeLists.txt +++ b/external/antithesis-sdk/CMakeLists.txt @@ -6,7 +6,7 @@ project(antithesis-sdk-cpp VERSION 0.4.4 LANGUAGES CXX) add_library(antithesis-sdk-cpp INTERFACE antithesis_sdk.h) # Note, both sections below created by xrpld project -target_include_directories(antithesis-sdk-cpp INTERFACE +target_include_directories(antithesis-sdk-cpp SYSTEM INTERFACE $ $ ) diff --git a/nix/check-tools/nix-ubuntu-amd64.txt b/nix/check-tools/nix-ubuntu-amd64.txt index 6082bc3061..ae565f58ec 100644 --- a/nix/check-tools/nix-ubuntu-amd64.txt +++ b/nix/check-tools/nix-ubuntu-amd64.txt @@ -5,8 +5,8 @@ Core build tools: cmake version 4.4.3 /nix/store/jcvvpih1046akxcwh9hdiak5q24jqcf0-cmake-4.4.3/bin/cmake ✅ conan - Conan version 2.32.0 - /nix/store/q0g5grbh7zm8gfhhnq5h6fm1rbs9yv3n-conan-2.32.0/bin/conan + Conan version 2.33.0 + /nix/store/b4lnzrqc60glhl9al1nakfc0vd20kdna-conan-2.33.0/bin/conan ✅ git git version 2.55.0 /nix/store/lg46w7hrjx7kylsh6645c9l975i8h43b-git-2.55.0/bin/git @@ -19,17 +19,17 @@ Development tooling: ccache version 4.13.6 /nix/store/p1a1s700dqsw1b3b8d2ba64nqw68zgpy-ccache-4.13.6/bin/ccache ✅ clang - clang version 22.1.8 - /nix/store/dggxva67vs7virgsmd6xkwd6p7zsc5pn-clang-wrapper-22.1.8/bin/clang - ✅ clang-22 - clang version 22.1.8 - /nix/store/ckz6y10v5dbyswpf9f6hd8kjfv84f920-clang-22/bin/clang-22 + clang version 23.1.0 + /nix/store/mlqh1xrp0zi3i5g9b0zjcz6zlbbzdgb8-clang-wrapper-23.1.0/bin/clang + ✅ clang-23 + clang version 23.1.0 + /nix/store/xgi7q1bady9dk89zvjmiicjzzp1gvm7x-clang-23/bin/clang-23 ✅ clang++ - clang version 22.1.8 - /nix/store/dggxva67vs7virgsmd6xkwd6p7zsc5pn-clang-wrapper-22.1.8/bin/clang++ - ✅ clang++-22 - clang version 22.1.8 - /nix/store/lsishk8fwbdmlwr5fbwyd3yhhjsm67qr-clang++-22/bin/clang++-22 + clang version 23.1.0 + /nix/store/mlqh1xrp0zi3i5g9b0zjcz6zlbbzdgb8-clang-wrapper-23.1.0/bin/clang++ + ✅ clang++-23 + clang version 23.1.0 + /nix/store/4slsaz29v72xgc4g36cp94f0p41a81pv-clang++-23/bin/clang++-23 ✅ ClangBuildAnalyzer ClangBuildAnalyzer 1.6.0 /nix/store/gvx8im1c89vspwb8ixa91lr1dagbi241-clangbuildanalyzer-1.6.0/bin/ClangBuildAnalyzer @@ -67,23 +67,23 @@ Development tooling: Zip 3.0 /nix/store/5ypvkry3qra47dylc9kfk36r1q9vha80-zip-3.0/bin/zip ✅ clang-apply-replacements - clang-apply-replacements version 22.1.8 - /nix/store/37jhp4j3y339zmkx09qbr3fpfy3q0kl0-clang-tools-22.1.8/bin/clang-apply-replacements - ✅ clang-apply-replacements-22 - clang-apply-replacements version 22.1.8 - /nix/store/qg0b99zn522gl3vz9hx9ni9ianb11d1r-clang-apply-replacements-22/bin/clang-apply-replacements-22 + clang-apply-replacements version 23.1.0 + /nix/store/ipnj8b3s6f00ngi26fi7p5h9lxv6a3s3-clang-tools-23.1.0/bin/clang-apply-replacements + ✅ clang-apply-replacements-23 + clang-apply-replacements version 23.1.0 + /nix/store/lbyc9hrkkymybah7b6n8c7sijlgldfz0-clang-apply-replacements-23/bin/clang-apply-replacements-23 ✅ clang-format - clang-format version 22.1.8 - /nix/store/37jhp4j3y339zmkx09qbr3fpfy3q0kl0-clang-tools-22.1.8/bin/clang-format - ✅ clang-format-22 - clang-format version 22.1.8 - /nix/store/m1al4bygpn7i13q1kalavybwh9ldg6rz-clang-format-22/bin/clang-format-22 + clang-format version 23.1.0 + /nix/store/ipnj8b3s6f00ngi26fi7p5h9lxv6a3s3-clang-tools-23.1.0/bin/clang-format + ✅ clang-format-23 + clang-format version 23.1.0 + /nix/store/40w351b7i7aqhpl5wmicfnp2ij8k12g9-clang-format-23/bin/clang-format-23 ✅ clang-tidy - LLVM version 22.1.8 - /nix/store/37jhp4j3y339zmkx09qbr3fpfy3q0kl0-clang-tools-22.1.8/bin/clang-tidy - ✅ clang-tidy-22 - LLVM version 22.1.8 - /nix/store/h51xrqf8xgx4zil2rm1ydp909858y4xm-clang-tidy-22/bin/clang-tidy-22 + LLVM version 23.1.0 + /nix/store/ipnj8b3s6f00ngi26fi7p5h9lxv6a3s3-clang-tools-23.1.0/bin/clang-tidy + ✅ clang-tidy-23 + LLVM version 23.1.0 + /nix/store/40rj38k5ygq7sawkiv0cdaljclbspwz9-clang-tidy-23/bin/clang-tidy-23 ✅ dot dot - graphviz version 15.1.1 (0) /nix/store/f7r47nc0d13xa4c2xaaxa6dp3pzm9sp1-graphviz-15.1.1/bin/dot @@ -110,10 +110,10 @@ Development tooling: /nix/store/6blf72f7sdmlrqjggxvk5ij4cxb7fk4c-pre-commit-4.6.2/bin/pre-commit ✅ run-clang-tidy usage: run-clang-tidy [-h] [-allow-enabling-alpha-checkers] - /nix/store/a760dc8nldq1715410384bkk83idmm00-run-clang-tidy/bin/run-clang-tidy - ✅ run-clang-tidy-22 + /nix/store/y7isn3dr8bildnp78vk5nhcav63g80dz-run-clang-tidy/bin/run-clang-tidy + ✅ run-clang-tidy-23 usage: run-clang-tidy [-h] [-allow-enabling-alpha-checkers] - /nix/store/xwh85m9sa5h8fnpnlmqwfnf2sz9l59mm-run-clang-tidy-22/bin/run-clang-tidy-22 + /nix/store/pm5a8465hs9zb5i116b39i0y3xfpw6n3-run-clang-tidy-23/bin/run-clang-tidy-23 Rust toolchain: ✅ cargo diff --git a/nix/check-tools/nix-ubuntu-arm64.txt b/nix/check-tools/nix-ubuntu-arm64.txt index 6b567fe1f7..b33733f164 100644 --- a/nix/check-tools/nix-ubuntu-arm64.txt +++ b/nix/check-tools/nix-ubuntu-arm64.txt @@ -5,8 +5,8 @@ Core build tools: cmake version 4.4.3 /nix/store/39cq2g3d3flq2lmb6hc09grxs4xaax8p-cmake-4.4.3/bin/cmake ✅ conan - Conan version 2.32.0 - /nix/store/vbr044x1zbq062kkw53zm0sm3slv8g56-conan-2.32.0/bin/conan + Conan version 2.33.0 + /nix/store/grz6a77mllqzzmg198qagx1r9zhvfijw-conan-2.33.0/bin/conan ✅ git git version 2.55.0 /nix/store/kj6aff4gmz3snpp35rl3gysbl9srd81a-git-2.55.0/bin/git @@ -19,17 +19,17 @@ Development tooling: ccache version 4.13.6 /nix/store/nzb1lir9sw06fn4635kfx055myqanaz8-ccache-4.13.6/bin/ccache ✅ clang - clang version 22.1.8 - /nix/store/7z7by1cxa52mk7hjia1pimjvsd6aizhf-clang-wrapper-22.1.8/bin/clang - ✅ clang-22 - clang version 22.1.8 - /nix/store/pqn36q5paasw7v8sjgz5fd90mfpgkkqr-clang-22/bin/clang-22 + clang version 23.1.0 + /nix/store/g8sc13kz6jarzip643hk01832x40v8ms-clang-wrapper-23.1.0/bin/clang + ✅ clang-23 + clang version 23.1.0 + /nix/store/j8qvcg9150s5n09qg8p62q5z3ci02hd9-clang-23/bin/clang-23 ✅ clang++ - clang version 22.1.8 - /nix/store/7z7by1cxa52mk7hjia1pimjvsd6aizhf-clang-wrapper-22.1.8/bin/clang++ - ✅ clang++-22 - clang version 22.1.8 - /nix/store/m9a3slb0lcixm2csgjz9s0nvj9m5ysnq-clang++-22/bin/clang++-22 + clang version 23.1.0 + /nix/store/g8sc13kz6jarzip643hk01832x40v8ms-clang-wrapper-23.1.0/bin/clang++ + ✅ clang++-23 + clang version 23.1.0 + /nix/store/n62cn5w7fgbslamy3dgm8zhl5yly7zq0-clang++-23/bin/clang++-23 ✅ ClangBuildAnalyzer ClangBuildAnalyzer 1.6.0 /nix/store/ml2991pbdhh0qcxqj9331lhpsg449vky-clangbuildanalyzer-1.6.0/bin/ClangBuildAnalyzer @@ -67,23 +67,23 @@ Development tooling: Zip 3.0 /nix/store/lfwhq17wfcmjy823fldhlhxj1hjchdzc-zip-3.0/bin/zip ✅ clang-apply-replacements - clang-apply-replacements version 22.1.8 - /nix/store/6jr2pbz9mzxznf47lw1w6ss1arqsakw6-clang-tools-22.1.8/bin/clang-apply-replacements - ✅ clang-apply-replacements-22 - clang-apply-replacements version 22.1.8 - /nix/store/mgcaw2063w2d4s61fz023bd0pf3vq5y7-clang-apply-replacements-22/bin/clang-apply-replacements-22 + clang-apply-replacements version 23.1.0 + /nix/store/jh9xhz6gwxyz3rfx7vy5g4j5d71w940r-clang-tools-23.1.0/bin/clang-apply-replacements + ✅ clang-apply-replacements-23 + clang-apply-replacements version 23.1.0 + /nix/store/1ajzrfr62m3cianfh9i97r30a7vp1xmb-clang-apply-replacements-23/bin/clang-apply-replacements-23 ✅ clang-format - clang-format version 22.1.8 - /nix/store/6jr2pbz9mzxznf47lw1w6ss1arqsakw6-clang-tools-22.1.8/bin/clang-format - ✅ clang-format-22 - clang-format version 22.1.8 - /nix/store/2iwvl9784yrjfjhfac46z5ihwmbaavk7-clang-format-22/bin/clang-format-22 + clang-format version 23.1.0 + /nix/store/jh9xhz6gwxyz3rfx7vy5g4j5d71w940r-clang-tools-23.1.0/bin/clang-format + ✅ clang-format-23 + clang-format version 23.1.0 + /nix/store/5nfddq7xgbp4zmj8jn7xk1pxyyn5wiwl-clang-format-23/bin/clang-format-23 ✅ clang-tidy - LLVM version 22.1.8 - /nix/store/6jr2pbz9mzxznf47lw1w6ss1arqsakw6-clang-tools-22.1.8/bin/clang-tidy - ✅ clang-tidy-22 - LLVM version 22.1.8 - /nix/store/2b7hn8hyp02yfarh8c40c4jsjkm789l0-clang-tidy-22/bin/clang-tidy-22 + LLVM version 23.1.0 + /nix/store/jh9xhz6gwxyz3rfx7vy5g4j5d71w940r-clang-tools-23.1.0/bin/clang-tidy + ✅ clang-tidy-23 + LLVM version 23.1.0 + /nix/store/cawfgsx0vsslc1f007cavmy8md9drb1r-clang-tidy-23/bin/clang-tidy-23 ✅ dot dot - graphviz version 15.1.1 (0) /nix/store/vz4zb8d1rfigzzdn3i0hd4kff28vk02l-graphviz-15.1.1/bin/dot @@ -110,10 +110,10 @@ Development tooling: /nix/store/5f3av75nc7n7xbf2hlvlagzpp2g8g562-pre-commit-4.6.2/bin/pre-commit ✅ run-clang-tidy usage: run-clang-tidy [-h] [-allow-enabling-alpha-checkers] - /nix/store/b1yccjmij9qiha8a8d9yxayjdh5cg2vq-run-clang-tidy/bin/run-clang-tidy - ✅ run-clang-tidy-22 + /nix/store/nlg35d9ccslsq5qny7raxyyyrxgk7vsq-run-clang-tidy/bin/run-clang-tidy + ✅ run-clang-tidy-23 usage: run-clang-tidy [-h] [-allow-enabling-alpha-checkers] - /nix/store/v75dyrp7vwdgx5w2fzwsy00lf94qpz0i-run-clang-tidy-22/bin/run-clang-tidy-22 + /nix/store/a50nf8hp8p8l8pgcf9fs0j25hij5acw3-run-clang-tidy-23/bin/run-clang-tidy-23 Rust toolchain: ✅ cargo