Skip to content

Commit f505457

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Migrate variation job to GitHub actions Migrate --repeat 2 job to GitHub actions
2 parents a107266 + 90b4372 commit f505457

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

.github/nightly_matrix.php

Lines changed: 19 additions & 3 deletions
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,22 @@ 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+
$jobs[] = [
65+
'name' => '_VARIATION',
66+
'branch' => $branch,
67+
'debug' => true,
68+
'zts' => true,
69+
'run_tests_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
70+
];
71+
}
5672
}
5773
return $jobs;
5874
}
@@ -65,7 +81,7 @@ function get_asan_matrix(array $branches) {
6581
}
6682

6783
$branches = get_branches();
68-
$asan_matrix = get_asan_matrix($branches);
84+
$matrix_include = get_matrix_include($branches);
6985

7086
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";
87+
echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,7 @@ jobs:
4646
parameters:
4747
configurationName: I386_RELEASE_ZTS
4848
configurationParameters: '--disable-debug --enable-zts'
49-
- template: azure/job.yml
50-
parameters:
51-
configurationName: DEBUG_NTS_REPEAT
52-
configurationParameters: '--enable-debug --disable-zts'
53-
runTestsParameters: '--repeat 2'
5449
- template: azure/libmysqlclient_job.yml
5550
parameters:
5651
configurationName: LIBMYSQLCLIENT_DEBUG_NTS
5752
configurationParameters: '--enable-debug --disable-zts'
58-
- template: azure/job.yml
59-
parameters:
60-
configurationName: VARIATION_DEBUG_ZTS
61-
configurationParameters: >-
62-
--enable-debug --enable-zts
63-
CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1"

0 commit comments

Comments
 (0)