Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  [skip ci] Backport 0e7ef95 and 4f0d4c0
This commit is contained in:
Ilija Tovilo 2024-04-21 16:13:21 +02:00
commit 2f64d07337
No known key found for this signature in database
GPG key ID: A4F5D403F118200A

View file

@ -45,6 +45,7 @@ env:
CXX: ccache g++ CXX: ccache g++
jobs: jobs:
LINUX_X64: LINUX_X64:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
services: services:
mysql: mysql:
image: mysql:8 image: mysql:8
@ -137,6 +138,7 @@ jobs:
if: ${{ !matrix.asan }} if: ${{ !matrix.asan }}
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
MACOS_DEBUG_NTS: MACOS_DEBUG_NTS:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
runs-on: macos-12 runs-on: macos-12
steps: steps:
- name: git checkout - name: git checkout
@ -170,6 +172,7 @@ jobs:
- name: Verify generated files are up to date - name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files uses: ./.github/actions/verify-generated-files
WINDOWS: WINDOWS:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
name: WINDOWS_X64_ZTS name: WINDOWS_X64_ZTS
runs-on: windows-2019 runs-on: windows-2019
env: env:
@ -196,7 +199,7 @@ jobs:
run: .github/scripts/windows/test.bat run: .github/scripts/windows/test.bat
BENCHMARKING: BENCHMARKING:
name: BENCHMARKING name: BENCHMARKING
if: github.repository_owner == 'php' || github.event_name == 'pull_request' if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: git checkout - name: git checkout