[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

From: Date: Mon, 10 Aug 2026 17:06:54 +0000
Subject: [php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140596@lists.php.net to get a copy of this message
Author: Arnaud Le Blanc (arnaud-lb) Date: 2026-08-10T19:06:02+02:00 Commit: https://github.com/php/php-src/commit/a75f28d4791813f4c0c178a36bb0aacba9197784 Raw diff: https://github.com/php/php-src/commit/a75f28d4791813f4c0c178a36bb0aacba9197784.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: CI: Select Windows test workers automatically (#22946) Changed paths: M .github/matrix.php M .github/workflows/test-suite.yml Diff: diff --git a/.github/matrix.php b/.github/matrix.php index 7970442d7050..88e505d1f1eb 100644 --- a/.github/matrix.php +++ b/.github/matrix.php @@ -187,6 +187,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re foreach ($branches as &$branch) { $php_version = $branch['version'][0] . '.' . $branch['version'][1]; $branch['jobs'] = select_jobs($repository, $trigger, $nightly, $labels, $php_version, $branch['ref'], $all_variations); + $branch['config']['default_run_test_jobs'] = version_compare($php_version, '8.6', '>=') ? '' : '-j2'; $branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04'; } diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index c2b076059bc0..2046a3d816c8 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -857,7 +857,7 @@ jobs: PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }} THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}" INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}" - PARALLEL: -j2 + PARALLEL: ${{ matrix.asan && '-j2' || fromJson(inputs.branch).config.default_run_test_jobs }} OPCACHE: "${{ matrix.opcache && '1' || '0' }}" ASAN: "${{ matrix.asan && '1' || '0' }}" CLANG_TOOLSET: "${{ matrix.clang && '1' || '0' }}"

« previous php.cvs (#140596) next »