Skip to content

Commit 4fa25b0

Browse files
committed
Fix enabling of opcache in community job for PHP <8.5
We still need the zend_extension there. This has been broken for a while. Closes GH-23295
1 parent 8a90e02 commit 4fa25b0

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/matrix.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
7373
&& ($all_jobs || !$no_jobs || $test_benchmarking)
7474
// push trigger is restricted to official repository.
7575
&& ($repository === 'php/php-src' || $trigger === 'pull_request')) {
76-
$jobs['BENCHMARKING']['config']['integrated_opcache'] = version_compare($php_version, '8.5', '>=');
76+
$jobs['BENCHMARKING'] = true;
7777
}
7878
if ($all_jobs || $test_community) {
7979
$jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')
@@ -189,6 +189,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
189189
$branch['jobs'] = select_jobs($repository, $trigger, $nightly, $labels, $php_version, $branch['ref'], $all_variations);
190190
$branch['config']['default_run_test_jobs'] = version_compare($php_version, '8.6', '>=') ? '' : '-j2';
191191
$branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
192+
$branch['config']['integrated_opcache'] = version_compare($php_version, '8.5', '>=');
192193
}
193194

194195
echo "All variations:";

.github/workflows/test-suite.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ jobs:
472472
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
473473
- name: Enable Opcache
474474
run: |
475+
${{ !fromJson(inputs.branch).config.integrated_opcache && 'echo zend_extension=opcache.so >> /etc/php.d/opcache.ini' || '' }}
475476
echo memory_limit=-1 >> /etc/php.d/opcache.ini
476477
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
477478
echo opcache.enable=1 >> /etc/php.d/opcache.ini
@@ -966,7 +967,7 @@ jobs:
966967
sudo mkdir -p /etc/php.d
967968
sudo chmod 777 /etc/php.d
968969
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
969-
${{ !fromJson(inputs.branch).jobs.BENCHMARKING.config.integrated_opcache && 'echo zend_extension=opcache.so >> /etc/php.d/opcache.ini' || '' }}
970+
${{ !fromJson(inputs.branch).config.integrated_opcache && 'echo zend_extension=opcache.so >> /etc/php.d/opcache.ini' || '' }}
970971
echo opcache.enable=1 >> /etc/php.d/opcache.ini
971972
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
972973
- name: Setup

0 commit comments

Comments
 (0)