Skip to content

Commit b14d440

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Switch asan build to Ubuntu 24.04
2 parents 271b9e6 + 91c0679 commit b14d440

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
@@ -52,7 +52,7 @@ runs:
5252
libedit-dev \
5353
libldap2-dev \
5454
libsodium-dev \
55-
libargon2-0-dev \
55+
libargon2-dev \
5656
libmm-dev \
5757
libsnmp-dev \
5858
postgresql \

.github/workflows/push.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ jobs:
7777
zts: true
7878
asan: true
7979
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
80-
runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
81-
container:
82-
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
80+
runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
8381
steps:
8482
- name: git checkout
8583
uses: actions/checkout@v4
@@ -120,7 +118,7 @@ jobs:
120118
configurationParameters: >-
121119
--${{ matrix.debug && 'enable' || 'disable' }}-debug
122120
--${{ matrix.zts && 'enable' || 'disable' }}-zts
123-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16' || '' }}
121+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++' || '' }}
124122
skipSlow: ${{ matrix.asan }}
125123
- name: make
126124
run: make -j$(/usr/bin/nproc) >/dev/null

ext/curl/tests/curl_pushfunction_trampoline.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Test trampoline for curl option CURLMOPT_PUSHFUNCTION
33
--EXTENSIONS--
44
curl
5+
--XLEAK--
56
--SKIPIF--
67
<?php
78
include 'skipif-nocaddy.inc';

0 commit comments

Comments
 (0)