From 9075ab00232aa8db5b3a1733c14ae8be5a1c2306 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed, 25 Sep 2024 21:23:44 +0200
Subject: [PATCH] Switch asan build to Ubuntu 24.04

---
 .github/actions/apt-x64/action.yml                         | 2 +-
 .github/workflows/push.yml                                 | 6 ++----
 ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml
index 8f2f608278f07..bc2aa00df20b1 100644
--- a/.github/actions/apt-x64/action.yml
+++ b/.github/actions/apt-x64/action.yml
@@ -50,7 +50,7 @@ runs:
           libreadline-dev \
           libldap2-dev \
           libsodium-dev \
-          libargon2-0-dev \
+          libargon2-dev \
           libmm-dev \
           libsnmp-dev \
           postgresql \
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 3e239b24f7495..6edba327f57bb 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -73,9 +73,7 @@ jobs:
             zts: true
             asan: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
-    runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04
-    container:
-      image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
+    runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -112,7 +110,7 @@ jobs:
           configurationParameters: >-
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
-            ${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
+            ${{ 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' || '' }}
           skipSlow: ${{ matrix.asan }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
diff --git a/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt b/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt
index fe2defa5eea08..bc54ba6539ee7 100644
--- a/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt
+++ b/ext/curl/tests/curl_pushfunction_nonexistent_callback.phpt
@@ -6,6 +6,7 @@ Kévin Dunglas
 Niels Dossche
 --EXTENSIONS--
 curl
+--XLEAK--
 --SKIPIF--
 <?php
 include 'skipif-nocaddy.inc';