Skip to content

Commit de0cef4

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Reduce parallelism on frequently crashing jobs
2 parents f4b473c + ace91dd commit de0cef4

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:
@@ -45,7 +48,7 @@ runs:
4548
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
4649
-d opcache.jit=${{ inputs.jitType }} \
4750
-d opcache.jit_buffer_size=16M \
48-
-j$(/usr/bin/nproc) \
51+
${{ inputs.idleCpu == 'true' && '-j$(($(/usr/bin/nproc) - 1))' || '-j$(/usr/bin/nproc)' }} \
4952
-g FAIL,BORK,LEAK,XLEAK \
5053
--no-progress \
5154
--offline \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runs:
2222
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2323
-d opcache.jit=${{ inputs.jitType }} \
2424
-d opcache.jit_buffer_size=16M \
25-
-j$(sysctl -n hw.ncpu) \
25+
-j$(($(sysctl -n hw.ncpu) - 1)) \
2626
-g FAIL,BORK,LEAK,XLEAK \
2727
--no-progress \
2828
--offline \

.github/workflows/nightly.yml

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

0 commit comments

Comments
 (0)