mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.5'
* PHP-8.5: Fix enabling of opcache in benchmark job in older branches
This commit is contained in:
2
.github/matrix.php
vendored
2
.github/matrix.php
vendored
@@ -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', '>=')
|
||||
|
||||
1
.github/workflows/test-suite.yml
vendored
1
.github/workflows/test-suite.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user