From c6894b866e6a012cc15c938e494d75806f869b64 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 3 Mar 2026 16:53:42 +0100 Subject: [PATCH] Fix enabling of opcache in benchmark job in older branches 8.4 still needs a zend_extension=opcache.so in the ini file. --- .github/matrix.php | 2 +- .github/workflows/test-suite.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/matrix.php b/.github/matrix.php index 9164dd4b3c001..64bb60519de6b 100644 --- a/.github/matrix.php +++ b/.github/matrix.php @@ -73,7 +73,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re && ($all_jobs || !$no_jobs || $test_benchmarking) // push trigger is restricted to official repository. && ($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) { $jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=') diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 0fd95f67f9c41..9f5496d1d69cb 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -1036,6 +1036,7 @@ jobs: sudo mkdir -p /etc/php.d sudo chmod 777 /etc/php.d 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_cli=1 >> /etc/php.d/opcache.ini - name: Setup