Skip to content

Commit 0430e76

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Increase job timeout for ASAN/UBSAN build
2 parents fa2c519 + 2c8f2e9 commit 0430e76

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

.github/nightly_matrix.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ function get_matrix_include(array $branches) {
5252
'zts' => true,
5353
'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
5454
'run_tests_parameters' => '--asan',
55+
'timeout_minutes' => 480,
5556
];
5657
if ($branch['ref'] !== 'PHP-8.0') {
5758
$jobs[] = [
@@ -60,13 +61,15 @@ function get_matrix_include(array $branches) {
6061
'debug' => true,
6162
'zts' => false,
6263
'run_tests_parameters' => '--repeat 2',
64+
'timeout_minutes' => 360,
6365
];
6466
$jobs[] = [
6567
'name' => '_VARIATION',
6668
'branch' => $branch,
6769
'debug' => true,
6870
'zts' => true,
6971
'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
72+
'timeout_minutes' => 360,
7073
];
7174
}
7275
}

.github/workflows/nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ jobs:
4141
debug: [true, false]
4242
name: ['']
4343
run_tests_parameters: ['']
44+
timeout_minutes: [360]
4445
zts: [true, false]
4546
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
4647
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
4748
runs-on: ubuntu-20.04
49+
timeout-minutes: ${{ matrix.timeout_minutes }}
4850
steps:
4951
- name: git checkout
5052
uses: actions/checkout@v2

0 commit comments

Comments
 (0)