Skip to content

Commit 2cf7d70

Browse files
committed
Migrate --repeat 2 job to GitHub actions
1 parent 5c72029 commit 2cf7d70

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.github/nightly_matrix.php

+12-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function get_branches() {
4242
return get_branch_matrix($changed_branches);
4343
}
4444

45-
function get_asan_matrix(array $branches) {
45+
function get_matrix_include(array $branches) {
4646
$jobs = [];
4747
foreach ($branches as $branch) {
4848
$jobs[] = [
@@ -53,6 +53,15 @@ function get_asan_matrix(array $branches) {
5353
'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
5454
'run_tests_parameters' => '--asan',
5555
];
56+
if ($branch !== 'PHP-8.0') {
57+
$jobs[] = [
58+
'name' => '_REPEAT',
59+
'branch' => $branch,
60+
'debug' => true,
61+
'zts' => false,
62+
'run_tests_parameters' => '--repeat 2',
63+
];
64+
}
5665
}
5766
return $jobs;
5867
}
@@ -65,7 +74,7 @@ function get_asan_matrix(array $branches) {
6574
}
6675

6776
$branches = get_branches();
68-
$asan_matrix = get_asan_matrix($branches);
77+
$matrix_include = get_matrix_include($branches);
6978

7079
echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
71-
echo '::set-output name=asan-matrix::' . json_encode($asan_matrix, JSON_UNESCAPED_SLASHES) . "\n";
80+
echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";

.github/workflows/nightly.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
outputs:
1212
branches: ${{ steps.set-matrix.outputs.branches }}
13-
asan-matrix: ${{ steps.set-matrix.outputs.asan-matrix }}
13+
matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
1414
steps:
1515
- uses: actions/checkout@v2
1616
with:
@@ -39,7 +39,7 @@ jobs:
3939
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
4040
debug: [true, false]
4141
zts: [true, false]
42-
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.asan-matrix) }}
42+
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
4343
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
4444
runs-on: ubuntu-20.04
4545
steps:

azure-pipelines.yml

-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ jobs:
4444
parameters:
4545
configurationName: I386_RELEASE_ZTS
4646
configurationParameters: '--disable-debug --enable-zts'
47-
- template: azure/job.yml
48-
parameters:
49-
configurationName: DEBUG_NTS_REPEAT
50-
configurationParameters: '--enable-debug --disable-zts'
51-
runTestsParameters: '--repeat 2'
5247
- template: azure/libmysqlclient_job.yml
5348
parameters:
5449
configurationName: LIBMYSQLCLIENT_DEBUG_NTS

0 commit comments

Comments
 (0)