Skip to content

Commit 7090c8f

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Fix test action with no opcache
2 parents 88b62cd + 8342b38 commit 7090c8f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
export SKIP_IO_CAPTURE_TESTS=1
1919
export STACK_LIMIT_DEFAULTS_CHECK=1
2020
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
21-
${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' }} \
21+
${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
2222
-d opcache.jit=${{ inputs.jitType }} \
2323
-d opcache.jit_buffer_size=64M \
2424
-j$(nproc) \

.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 opcache.enable_cli=1' }} \
48+
${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
4949
-d opcache.jit=${{ inputs.jitType }} \
5050
-d opcache.protect_memory=1 \
5151
-d opcache.jit_buffer_size=64M \

.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 opcache.enable_cli=1' }} \
22+
${{ inputs.enableOpcache == 'true' && '-d opcache.enable_cli=1' || '' }} \
2323
-d opcache.jit=${{ inputs.jitType }} \
2424
-d opcache.protect_memory=1 \
2525
-d opcache.jit_buffer_size=64M \

0 commit comments

Comments
 (0)