Skip to content

Commit 91c0679

Browse files
committed
Switch asan build to Ubuntu 24.04
Closes GH-16065
1 parent 8b7f64f commit 91c0679

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/actions/apt-x64/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ runs:
5050
libreadline-dev \
5151
libldap2-dev \
5252
libsodium-dev \
53-
libargon2-0-dev \
53+
libargon2-dev \
5454
libmm-dev \
5555
libsnmp-dev \
5656
postgresql \

.github/workflows/push.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ 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-${{ !matrix.asan && '22' || '24' }}.04
7977
steps:
8078
- name: git checkout
8179
uses: actions/checkout@v4
@@ -112,7 +110,7 @@ jobs:
112110
configurationParameters: >-
113111
--${{ matrix.debug && 'enable' || 'disable' }}-debug
114112
--${{ 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' || '' }}
113+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
116114
skipSlow: ${{ matrix.asan }}
117115
- name: make
118116
run: make -j$(/usr/bin/nproc) >/dev/null

ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Kévin Dunglas
66
Niels Dossche
77
--EXTENSIONS--
88
curl
9+
--XLEAK--
910
--SKIPIF--
1011
<?php
1112
include 'skipif-nocaddy.inc';

0 commit comments

Comments
 (0)