Skip to content

Commit f999f09

Browse files
nielsdosiluuu1994
authored andcommitted
Use Clang 16 to work around LSAN TLS crashes (php#12496)
1 parent 784b745 commit f999f09

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/push.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,18 @@ jobs:
7373
zts: true
7474
asan: true
7575
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
76-
runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
77-
container:
78-
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
76+
runs-on: ubuntu-22.04
7977
steps:
8078
- name: git checkout
8179
uses: actions/checkout@v4
8280
- name: apt
8381
uses: ./.github/actions/apt-x64
82+
- name: LLVM 16 (ASAN-only)
83+
if: ${{ matrix.asan }}
84+
run: |
85+
wget https://apt.llvm.org/llvm.sh
86+
chmod u+x llvm.sh
87+
sudo ./llvm.sh 16
8488
- name: System info
8589
run: |
8690
echo "::group::Show host CPU info"
@@ -112,7 +116,7 @@ jobs:
112116
configurationParameters: >-
113117
--${{ matrix.debug && 'enable' || 'disable' }}-debug
114118
--${{ matrix.zts && 'enable' || 'disable' }}-zts
115-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
119+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16 --disable-opcache-jit' || '' }}
116120
skipSlow: ${{ matrix.asan }}
117121
- name: make
118122
run: make -j$(/usr/bin/nproc) >/dev/null

0 commit comments

Comments
 (0)