Skip to content

Commit 7a7f5ac

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: [skip ci] Backport CI changes
2 parents 3df1fa7 + 48605f4 commit 7a7f5ac

2 files changed

Lines changed: 16 additions & 7 deletions

File tree

.github/matrix.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,15 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
144144
$jobs['SOLARIS'] = true;
145145
}
146146
if ($all_jobs || !$no_jobs || $test_windows) {
147-
$jobs['WINDOWS']['matrix'] = $all_variations
148-
? ['include' => [
149-
['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true],
150-
['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false],
151-
]]
152-
: ['include' => [['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true]]];
147+
$matrix = [['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true]];
148+
if ($all_variations) {
149+
$matrix[] = ['asan' => true, 'opcache' => true, 'x64' => true, 'zts' => true];
150+
$matrix[] = ['asan' => false, 'opcache' => false, 'x64' => false, 'zts' => false];
151+
if (version_compare($php_version, '8.5', '>=')) {
152+
$matrix[] = ['asan' => false, 'opcache' => true, 'x64' => true, 'zts' => true, 'clang' => true];
153+
}
154+
}
155+
$jobs['WINDOWS']['matrix'] = ['include' => $matrix];
153156
$jobs['WINDOWS']['config'] = version_compare($php_version, '8.4', '>=')
154157
? ['vs_crt_version' => 'vs17']
155158
: ['vs_crt_version' => 'vs16'];

.github/workflows/test-suite.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,15 @@ jobs:
413413
with:
414414
enableOpcache: true
415415
jitType: tracing
416+
- name: Generate coverage report
417+
if: ${{ !cancelled() }}
418+
run: make gcovr-xml
416419
- uses: codecov/codecov-action@v6
417420
if: ${{ !cancelled() }}
418421
with:
422+
disable_search: true
419423
fail_ci_if_error: true
424+
files: gcovr.xml
420425
token: ${{ secrets.CODECOV_TOKEN }}
421426
verbose: true
422427
COMMUNITY:
@@ -935,7 +940,7 @@ jobs:
935940
strategy:
936941
fail-fast: false
937942
matrix: ${{ fromJson(inputs.branch).jobs.WINDOWS.matrix }}
938-
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}"
943+
name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}${{ matrix.clang && '_CLANG' || ''}}"
939944
runs-on: windows-2022
940945
env:
941946
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
@@ -949,6 +954,7 @@ jobs:
949954
PARALLEL: -j2
950955
OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
951956
ASAN: "${{ matrix.asan && '1' || '0' }}"
957+
CLANG_TOOLSET: "${{ matrix.clang && '1' || '0' }}"
952958
steps:
953959
- name: git config
954960
run: git config --global core.autocrlf false && git config --global core.eol lf

0 commit comments

Comments
 (0)