Skip to content

Commit bea5676

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Reduce parallelism on frequently crashing jobs
2 parents 1ade8ef + de0cef4 commit bea5676

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ inputs:
99
jitType:
1010
default: 'disable'
1111
required: false
12+
idleCpu:
13+
default: 'false'
14+
required: false
1215
runs:
1316
using: composite
1417
steps:
@@ -50,7 +53,7 @@ runs:
5053
-d opcache.jit=${{ inputs.jitType }} \
5154
-d opcache.protect_memory=1 \
5255
-d opcache.jit_buffer_size=64M \
53-
-j$(/usr/bin/nproc) \
56+
${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \
5457
-g FAIL,BORK,LEAK,XLEAK \
5558
--no-progress \
5659
--offline \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
-d opcache.jit=${{ inputs.jitType }} \
2424
-d opcache.protect_memory=1 \
2525
-d opcache.jit_buffer_size=64M \
26-
-j$(sysctl -n hw.ncpu) \
26+
-j$(($(sysctl -n hw.ncpu) - 1)) \
2727
-g FAIL,BORK,LEAK,XLEAK \
2828
--no-progress \
2929
--offline \

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ jobs:
108108
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
109109
runTestsParameters: >-
110110
${{ matrix.run_tests_parameters }}
111+
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
111112
- name: Test Tracing JIT
112113
uses: ./.github/actions/test-linux
113114
with:

0 commit comments

Comments
 (0)