php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix enabling of opcache in benchmark job in older branches
This commit is contained in:
Ilija Tovilo
2026-03-04 00:35:32 +01:00
parent 583be5a8ca 70bb94c4b6
commit 2fb1411eac
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/matrix.php vendored
View File

@@ -73,7 +73,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
&& ($all_jobs || !$no_jobs || $test_benchmarking) && ($all_jobs || !$no_jobs || $test_benchmarking)
// push trigger is restricted to official repository. // push trigger is restricted to official repository.
&& ($repository === 'php/php-src' || $trigger === 'pull_request')) { && ($repository === 'php/php-src' || $trigger === 'pull_request')) {
$jobs['BENCHMARKING'] = true; $jobs['BENCHMARKING']['config']['integrated_opcache'] = version_compare($php_version, '8.5', '>=');
} }
if ($all_jobs || $test_community) { if ($all_jobs || $test_community) {
$jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=') $jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')

1
.github/workflows/test-suite.yml vendored
View File

@@ -1036,6 +1036,7 @@ jobs:
sudo mkdir -p /etc/php.d sudo mkdir -p /etc/php.d
sudo chmod 777 /etc/php.d sudo chmod 777 /etc/php.d
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
${{ !fromJson(inputs.branch).jobs.BENCHMARKING.config.integrated_opcache && 'echo zend_extension=opcache.so >> /etc/php.d/opcache.ini' || '' }}
echo opcache.enable=1 >> /etc/php.d/opcache.ini echo opcache.enable=1 >> /etc/php.d/opcache.ini
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
- name: Setup - name: Setup