Skip to content

Commit ef18545

Browse files
hanno-beckermkannwischer
authored andcommitted
CI: Apply clang 22 macOS sanitizer fix to build_kat too
Same macOS 26 ASan startup deadlock as the preceding backend_tests fix. Set the macos-latest target's nix_shell to 'clang22', and pass nix-shell to build_kat's sanitizer step uniformly with the other steps (it omitted it and fell back to the action default). Other targets are unchanged. Signed-off-by: Hanno Becker <beckphan@amazon.co.uk>
1 parent 16d4868 commit ef18545

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ jobs:
1919
name: 'macOS (aarch64)'
2020
arch: mac
2121
mode: native
22-
nix_shell: ci
22+
# macos-latest is now the macOS 26 (Tahoe) image, whose clang 21
23+
# ASan runtime deadlocks at process startup (see backend_tests).
24+
# Build this target with clang 22, which carries the compiler-rt
25+
# fix (llvm/llvm-project#191039, backport #192082).
26+
nix_shell: clang22
2327
- runner: macos-15-intel
2428
name: 'macOS (x86_64)'
2529
arch: mac
@@ -115,6 +119,7 @@ jobs:
115119
uses: ./.github/actions/multi-functest
116120
if: ${{ matrix.target.mode == 'native' }}
117121
with:
122+
nix-shell: ${{ matrix.target.nix_shell }}
118123
gh_token: ${{ secrets.GITHUB_TOKEN }}
119124
compile_mode: native
120125
cflags: "-DMLDSA_DEBUG -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"

0 commit comments

Comments
 (0)