Skip to content

Commit 9974cc4

Browse files
committed
feedback
1 parent 5cc836e commit 9974cc4

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

.github/matrix.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,13 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
144144
$jobs['SOLARIS'] = true;
145145
}
146146
if ($all_jobs || !$no_jobs || $test_windows) {
147-
$windows_include = $all_variations
148-
? [
147+
$$jobs['WINDOWS']['matrix'] = $all_variations
148+
? ['include' => [
149149
['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true],
150150
['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false],
151-
]
152-
: [
153-
['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true],
154-
];
155-
if ($all_variations || $test_windows) {
156-
$windows_include[] = ['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true, 'clang' => true];
157-
}
158-
$jobs['WINDOWS']['matrix'] = ['include' => $windows_include];
151+
['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true, 'clang' => true]
152+
]]
153+
: [['include' => ['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true]]];
159154
$jobs['WINDOWS']['config'] = version_compare($php_version, '8.4', '>=')
160155
? ['vs_crt_version' => 'vs17']
161156
: ['vs_crt_version' => 'vs16'];

0 commit comments

Comments
 (0)