Skip to content

Commit f9bad8c

Browse files
iluuu1994iluuu1994
committed
[skip ci] Rename labels
"Enable all" -> "All jobs" "Disable all" -> "No jobs" "Comprehensive" -> "All variations"
1 parent 08b5240 commit f9bad8c

4 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎.github/nightly_matrix.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ function get_current_version(): array {
4646
return [$major, $minor];
4747
}
4848

49-
function select_jobs($trigger, $labels, $php_version, $ref, $comprehensive) {
50-
$disable_all = in_array('CI: Disable all', $labels, true);
51-
$enable_all = in_array('CI: Enable all', $labels, true);
49+
function select_jobs($trigger, $labels, $php_version, $ref, $all_variations) {
50+
$no_jobs = in_array('CI: No jobs', $labels, true);
51+
$all_jobs = in_array('CI: All jobs', $labels, true);
5252
$test_alpine = in_array('CI: Alpine', $labels, true);
5353
$test_benchmarking = in_array('CI: Benchmarking', $labels, true);
5454
$test_community = in_array('CI: Community', $labels, true);
@@ -63,10 +63,10 @@ function select_jobs($trigger, $labels, $php_version, $ref, $comprehensive) {
6363
$test_windows = in_array('CI: Windows', $labels, true);
6464

6565
$jobs = [];
66-
if (version_compare($php_version, '8.4', '>=') && ($enable_all || !$disable_all || $test_alpine)) {
66+
if (version_compare($php_version, '8.4', '>=') && ($all_jobs || !$no_jobs || $test_alpine)) {
6767
$jobs['ALPINE'] = true;
6868
}
69-
if ($enable_all || $test_community) {
69+
if ($all_jobs || $test_community) {
7070
$jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')
7171
? ['type' => ['asan', 'verify_type_inference']]
7272
: ['type' => ['asan']];
@@ -75,14 +75,14 @@ function select_jobs($trigger, $labels, $php_version, $ref, $comprehensive) {
7575
if ($trigger === 'schedule' && $ref === 'master') {
7676
$jobs['COVERAGE'] = true;
7777
}
78-
if ($enable_all || $test_libmysqlclient) {
78+
if ($all_jobs || $test_libmysqlclient) {
7979
$jobs['LIBMYSQLCLIENT'] = true;
8080
}
81-
if (version_compare($php_version, '8.4', '>=') && ($enable_all || $test_linux_ppc64)) {
81+
if (version_compare($php_version, '8.4', '>=') && ($all_jobs || $test_linux_ppc64)) {
8282
$jobs['LINUX_PPC64'] = true;
8383
}
84-
if ($enable_all || !$disable_all || $test_linux_x64) {
85-
$jobs['LINUX_X64']['matrix'] = $comprehensive
84+
if ($all_jobs || !$no_jobs || $test_linux_x64) {
85+
$jobs['LINUX_X64']['matrix'] = $all_variations
8686
? [
8787
'name' => [''],
8888
'asan' => [false],
@@ -102,42 +102,42 @@ function select_jobs($trigger, $labels, $php_version, $ref, $comprehensive) {
102102
]];
103103
$jobs['LINUX_X64']['config']['variation_enable_zend_max_execution_timers'] = version_compare($php_version, '8.3', '>=');
104104
}
105-
if ($enable_all || !$disable_all || $test_linux_x32) {
106-
$jobs['LINUX_X32']['matrix'] = $comprehensive
105+
if ($all_jobs || !$no_jobs || $test_linux_x32) {
106+
$jobs['LINUX_X32']['matrix'] = $all_variations
107107
? ['debug' => [true, false], 'zts' => [true, false]]
108108
: ['debug' => [true], 'zts' => [true]];
109109
}
110-
if ($enable_all || !$disable_all || $test_macos) {
110+
if ($all_jobs || !$no_jobs || $test_macos) {
111111
$test_arm = version_compare($php_version, '8.4', '>=');
112-
$jobs['MACOS']['matrix'] = $comprehensive
112+
$jobs['MACOS']['matrix'] = $all_variations
113113
? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]]
114114
: ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]];
115115
$jobs['MACOS']['config']['arm64_version'] = version_compare($php_version, '8.4', '>=') ? '15' : '14';
116116
}
117-
if ($enable_all || $test_msan) {
117+
if ($all_jobs || $test_msan) {
118118
$jobs['MSAN'] = true;
119119
}
120-
if ($enable_all || $test_opcache_variation) {
120+
if ($all_jobs || $test_opcache_variation) {
121121
$jobs['OPCACHE_VARIATION'] = true;
122122
}
123123
if ($trigger === 'schedule' && $ref === 'master') {
124124
$jobs['PECL'] = true;
125125
}
126-
if ($enable_all || !$disable_all || $test_windows) {
126+
if ($all_jobs || !$no_jobs || $test_windows) {
127127
$windows_jobs = ['include' => [['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true]]];
128-
if ($comprehensive) {
128+
if ($all_variations) {
129129
$windows_jobs['include'][] = ['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false];
130130
}
131131
$jobs['WINDOWS']['matrix'] = $windows_jobs;
132132
$jobs['WINDOWS']['config'] = version_compare($php_version, '8.4', '>=')
133133
? ['vs_crt_version' => 'vs17']
134134
: ['vs_crt_version' => 'vs16'];
135135
}
136-
if ($enable_all || !$disable_all || $test_benchmarking) {
136+
if ($all_jobs || !$no_jobs || $test_benchmarking) {
137137
$jobs['BENCHMARKING'] = true;
138138
}
139-
if ($enable_all || !$disable_all || $test_freebsd) {
140-
$jobs['FREEBSD']['matrix'] = $comprehensive && version_compare($php_version, '8.3', '>=')
139+
if ($all_jobs || !$no_jobs || $test_freebsd) {
140+
$jobs['FREEBSD']['matrix'] = $all_variations && version_compare($php_version, '8.3', '>=')
141141
? ['zts' => [true, false]]
142142
: ['zts' => [false]];
143143
}
@@ -160,15 +160,15 @@ function select_jobs($trigger, $labels, $php_version, $ref, $comprehensive) {
160160

161161
$labels = json_decode($argv[4] ?? '[]', true);
162162
$labels = array_column($labels, 'name');
163-
$comprehensive = $trigger === 'schedule' || $trigger === 'workflow_dispatch' || in_array('CI: Comprehensive', $labels, true);
163+
$all_variations = $trigger === 'schedule' || $trigger === 'workflow_dispatch' || in_array('CI: All variations', $labels, true);
164164

165165
foreach ($branches as &$branch) {
166166
$php_version = $branch['version'][0] . '.' . $branch['version'][1];
167-
$branch['jobs'] = select_jobs($trigger, $labels, $php_version, $branch['ref'], $comprehensive);
167+
$branch['jobs'] = select_jobs($trigger, $labels, $php_version, $branch['ref'], $all_variations);
168168
$branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
169169
}
170170

171171
$f = fopen(getenv('GITHUB_OUTPUT'), 'a');
172172
fwrite($f, 'branches=' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n");
173-
fwrite($f, 'comprehensive=' . json_encode($comprehensive, JSON_UNESCAPED_SLASHES) . "\n");
173+
fwrite($f, 'all_variations=' . json_encode($all_variations, JSON_UNESCAPED_SLASHES) . "\n");
174174
fclose($f);

‎.github/workflows/nightly.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: Test suite
22
on:
33
workflow_call:
44
inputs:
5+
all_variations:
6+
required: true
7+
type: boolean
58
branch:
69
required: true
710
type: string
8-
comprehensive:
9-
required: true
10-
type: boolean
1111
permissions:
1212
contents: read
1313
jobs:
@@ -165,16 +165,16 @@ jobs:
165165
${{ matrix.debug && 'CXXFLAGS="-D_GLIBCXX_ASSERTIONS"' || '' }}
166166
--${{ matrix.zts && 'enable' || 'disable' }}-zts
167167
asan: ${{ matrix.asan && 'true' || 'false' }}
168-
skipSlow: ${{ (matrix.asan && !inputs.comprehensive) && 'true' || 'false' }}
168+
skipSlow: ${{ (matrix.asan && !inputs.all_variations) && 'true' || 'false' }}
169169
- name: make
170170
run: make -j$(/usr/bin/nproc) >/dev/null
171171
- name: make install
172172
uses: ./.github/actions/install-linux
173173
- name: Setup
174-
if: ${{ !matrix.asan || inputs.comprehensive }}
174+
if: ${{ !matrix.asan || inputs.all_variations }}
175175
uses: ./.github/actions/setup-x64
176176
- name: Test
177-
if: ${{ inputs.comprehensive || !matrix.asan }}
177+
if: ${{ inputs.all_variations || !matrix.asan }}
178178
uses: ./.github/actions/test-linux
179179
with:
180180
runTestsParameters: >-
@@ -188,12 +188,12 @@ jobs:
188188
jitType: tracing
189189
runTestsParameters: >-
190190
${{ matrix.asan && '--asan' || '' }}
191-
${{ (matrix.asan && !inputs.comprehensive) && '-x' || '' }}
191+
${{ (matrix.asan && !inputs.all_variations) && '-x' || '' }}
192192
${{ matrix.repeat && '--repeat 2' || '' }}
193193
${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
194194
-d opcache.enable_cli=1
195195
- name: Test OpCache
196-
if: ${{ inputs.comprehensive }}
196+
if: ${{ inputs.all_variations }}
197197
uses: ./.github/actions/test-linux
198198
with:
199199
runTestsParameters: >-
@@ -204,7 +204,7 @@ jobs:
204204
- name: Test Function JIT
205205
# ASAN frequently timeouts. Each test run takes ~90 minutes, we can
206206
# avoid running into the 6 hour timeout by skipping the function JIT.
207-
if: ${{ inputs.comprehensive && !matrix.asan }}
207+
if: ${{ inputs.all_variations && !matrix.asan }}
208208
uses: ./.github/actions/test-linux
209209
with:
210210
jitType: function
@@ -277,7 +277,7 @@ jobs:
277277
- name: make install
278278
uses: ./.github/actions/install-linux-x32
279279
- name: Test
280-
if: ${{ inputs.comprehensive }}
280+
if: ${{ inputs.all_variations }}
281281
uses: ./.github/actions/test-linux
282282
- name: Test Tracing JIT
283283
uses: ./.github/actions/test-linux
@@ -286,13 +286,13 @@ jobs:
286286
runTestsParameters: >-
287287
-d opcache.enable_cli=1
288288
- name: Test OpCache
289-
if: ${{ inputs.comprehensive }}
289+
if: ${{ inputs.all_variations }}
290290
uses: ./.github/actions/test-linux
291291
with:
292292
runTestsParameters: >-
293293
-d opcache.enable_cli=1
294294
- name: Test Function JIT
295-
if: ${{ inputs.comprehensive }}
295+
if: ${{ inputs.all_variations }}
296296
uses: ./.github/actions/test-linux
297297
with:
298298
jitType: function
@@ -334,7 +334,7 @@ jobs:
334334
- name: make install
335335
run: sudo make install
336336
- name: Test
337-
if: ${{ inputs.comprehensive }}
337+
if: ${{ inputs.all_variations }}
338338
uses: ./.github/actions/test-macos
339339
- name: Test Tracing JIT
340340
if: matrix.arch == 'X64' || !matrix.zts
@@ -344,13 +344,13 @@ jobs:
344344
runTestsParameters: >-
345345
-d opcache.enable_cli=1
346346
- name: Test OpCache
347-
if: ${{ inputs.comprehensive || (matrix.arch == 'ARM64' && matrix.zts) }}
347+
if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
348348
uses: ./.github/actions/test-macos
349349
with:
350350
runTestsParameters: >-
351351
-d opcache.enable_cli=1
352352
- name: Test Function JIT
353-
if: inputs.comprehensive && (matrix.arch == 'X64' || !matrix.zts)
353+
if: inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts)
354354
uses: ./.github/actions/test-macos
355355
with:
356356
jitType: function

‎.github/workflows/push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
3737
runs-on: ubuntu-latest
3838
outputs:
39+
all_variations: ${{ steps.set-matrix.outputs.all_variations }}
3940
branches: ${{ steps.set-matrix.outputs.branches }}
40-
comprehensive: ${{ steps.set-matrix.outputs.comprehensive }}
4141
steps:
4242
- uses: actions/checkout@v6
4343
- name: Generate Matrix
@@ -52,8 +52,8 @@ jobs:
5252
matrix:
5353
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
5454
with:
55+
all_variations: ${{ needs.GENERATE_MATRIX.outputs.all_variations == 'true' && true || false }}
5556
branch: ${{ toJSON(matrix.branch) }}
56-
comprehensive: ${{ needs.GENERATE_MATRIX.outputs.comprehensive == 'true' && true || false }}
5757
secrets: inherit
5858
BENCHMARKING:
5959
name: BENCHMARKING

‎.github/workflows/root.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch'
1212
runs-on: ubuntu-latest
1313
outputs:
14+
all_variations: ${{ steps.set-matrix.outputs.all_variations }}
1415
branches: ${{ steps.set-matrix.outputs.branches }}
15-
comprehensive: ${{ steps.set-matrix.outputs.comprehensive }}
1616
steps:
1717
- uses: actions/checkout@v6
1818
with:
@@ -42,6 +42,6 @@ jobs:
4242
matrix:
4343
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
4444
with:
45+
all_variations: ${{ needs.GENERATE_MATRIX.outputs.all_variations == 'true' && true || false }}
4546
branch: ${{ toJSON(matrix.branch) }}
46-
comprehensive: ${{ needs.GENERATE_MATRIX.outputs.comprehensive == 'true' && true || false }}
4747
secrets: inherit

0 commit comments

Comments
 (0)