[php-src] master: Merge branch 'PHP-8.3'

From: Date: Tue, 19 Mar 2024 16:31:24 +0000
Subject: [php-src] master: Merge branch 'PHP-8.3'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-127795@lists.php.net to get a copy of this message
Author: Ilija Tovilo (iluuu1994) Date: 2024-03-19T17:17:21+01:00 Commit: https://github.com/php/php-src/commit/25a8f155f21199a7900b80416b8467a635849b2d Raw diff: https://github.com/php/php-src/commit/25a8f155f21199a7900b80416b8467a635849b2d.diff Merge branch 'PHP-8.3' * PHP-8.3: Fix ASan build Changed paths: M .github/workflows/push.yml Diff: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 923e5496ed82f..32753772a41b6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -80,7 +80,9 @@ jobs: zts: true asan: true name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}" - runs-on: ubuntu-22.04 + runs-on: ubuntu-${{ !matrix.asan && '22' || '20' }}.04 + container: + image: ${{ matrix.asan && 'ubuntu:23.04' || null }} steps: - name: git checkout uses: actions/checkout@v4

« previous php.cvs (#127795) next »