Skip to content

Commit cdff08f

Browse files
authored
Merge pull request DeusData#2136 from DeusData/ci/clang21-align-workflows
ci: repin the apt.llvm.org ASan + analyzer lanes to clang-21
2 parents 5b6a30d + 557cb01 commit cdff08f

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎.github/workflows/_lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ jobs:
6868
- name: Install build deps
6969
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev
7070

71-
- name: Install LLVM 22 (pinned analyzer toolchain)
71+
- name: Install LLVM 21 (pinned analyzer toolchain)
7272
run: |
7373
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
74-
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" | sudo tee /etc/apt/sources.list.d/llvm-22.list
74+
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main" | sudo tee /etc/apt/sources.list.d/llvm-21.list
7575
sudo apt-get update
76-
sudo apt-get install -y clang-tidy-22
76+
sudo apt-get install -y clang-tidy-21
7777
7878
- name: Memory-analyzer gate
79-
run: scripts/ci/lint-mem.sh clang-tidy-22
79+
run: scripts/ci/lint-mem.sh clang-tidy-21

‎.github/workflows/_test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ jobs:
227227
- name: Install deps
228228
run: sudo apt-get update && sudo apt-get install -y zlib1g-dev ccache
229229

230-
- name: Install LLVM 22 (pinned diagnostic toolchain)
230+
- name: Install LLVM 21 (pinned diagnostic toolchain)
231231
run: |
232232
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
233-
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-22 main" | sudo tee /etc/apt/sources.list.d/llvm-22.list
233+
echo "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main" | sudo tee /etc/apt/sources.list.d/llvm-21.list
234234
sudo apt-get update
235-
sudo apt-get install -y clang-22
235+
sudo apt-get install -y clang-21
236236
237237
- name: Compiler cache (content-verified, restore)
238238
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -247,11 +247,11 @@ jobs:
247247
# lane: stack-use-after-return, stack-use-after-scope, and strict string
248248
# checks. Mirrors `make -f Makefile.cbm diag`, including its reasoning
249249
# for leaving detect_invalid_pointer_pairs out.
250-
- name: Test (clang-22, ASan+UBSan + off-by-default ASan checks)
250+
- name: Test (clang-21, ASan+UBSan + off-by-default ASan checks)
251251
env:
252252
ASAN_OPTIONS: "detect_stack_use_after_return=1:strict_string_checks=1:detect_stack_use_after_scope=1"
253253
run: |
254-
scripts/test.sh CC=clang-22 CXX=clang++-22 \
254+
scripts/test.sh CC=clang-21 CXX=clang++-21 \
255255
SANITIZE="-fsanitize=address,undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls"
256256
257257
- name: Compiler cache (save)

0 commit comments

Comments
 (0)