Skip to content

Commit 6b81bfd

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fix test action with no opcache
2 parents a4a43a9 + 2fd4062 commit 6b81bfd

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/actions/test-linux/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ runs:
4545
export SKIP_IO_CAPTURE_TESTS=1
4646
export STACK_LIMIT_DEFAULTS_CHECK=1
4747
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
48-
${{ inputs.enableOpcache == 'true' && '-d zend_extension=opcache.so -d opcache.enable_cli=1' }} \
48+
${{ inputs.enableOpcache == 'true' && '-d zend_extension=opcache.so -d opcache.enable_cli=1' || '' }} \
4949
-d opcache.jit=${{ inputs.jitType }} \
5050
-d opcache.jit_buffer_size=16M \
5151
${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \

.github/actions/test-macos/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
export CI_NO_IPV6=1
2020
export STACK_LIMIT_DEFAULTS_CHECK=1
2121
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
22-
${{ inputs.enableOpcache == 'true' && '-d zend_extension=opcache.so -d opcache.enable_cli=1' }} \
22+
${{ inputs.enableOpcache == 'true' && '-d zend_extension=opcache.so -d opcache.enable_cli=1' || '' }} \
2323
-d opcache.jit=${{ inputs.jitType }} \
2424
-d opcache.jit_buffer_size=16M \
2525
-j$(($(sysctl -n hw.ncpu) - 1)) \

0 commit comments

Comments
 (0)