Skip to content

Commit 046d7f9

Browse files
authored
Use Clang 16 to work around LSAN TLS crashes (#12496)
1 parent 1b5e58f commit 046d7f9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/push.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,17 @@ jobs:
7373
asan: true
7474
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
7575
runs-on: ubuntu-22.04
76-
container:
77-
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
7876
steps:
7977
- name: git checkout
8078
uses: actions/checkout@v4
8179
- name: apt
8280
uses: ./.github/actions/apt-x64
81+
- name: LLVM 16 (ASAN-only)
82+
if: ${{ matrix.asan }}
83+
run: |
84+
wget https://apt.llvm.org/llvm.sh
85+
chmod u+x llvm.sh
86+
sudo ./llvm.sh 16
8387
- name: System info
8488
run: |
8589
echo "::group::Show host CPU info"
@@ -110,7 +114,7 @@ jobs:
110114
configurationParameters: >-
111115
--${{ matrix.debug && 'enable' || 'disable' }}-debug
112116
--${{ matrix.zts && 'enable' || 'disable' }}-zts
113-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
117+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16 --disable-opcache-jit' || '' }}
114118
skipSlow: ${{ matrix.asan }}
115119
- name: make
116120
run: make -j$(/usr/bin/nproc) >/dev/null

0 commit comments

Comments
 (0)