mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Increase job timeout for ASAN/UBSAN build
This commit is contained in:
commit
2dfb537ba5
3
.github/nightly_matrix.php
vendored
3
.github/nightly_matrix.php
vendored
@ -52,6 +52,7 @@ function get_matrix_include(array $branches) {
|
||||
'zts' => true,
|
||||
'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
|
||||
'run_tests_parameters' => '--asan',
|
||||
'timeout_minutes' => 480,
|
||||
];
|
||||
if ($branch['ref'] !== 'PHP-8.0') {
|
||||
$jobs[] = [
|
||||
@ -60,6 +61,7 @@ function get_matrix_include(array $branches) {
|
||||
'debug' => true,
|
||||
'zts' => false,
|
||||
'run_tests_parameters' => '--repeat 2',
|
||||
'timeout_minutes' => 360,
|
||||
];
|
||||
$jobs[] = [
|
||||
'name' => '_VARIATION',
|
||||
@ -67,6 +69,7 @@ function get_matrix_include(array $branches) {
|
||||
'debug' => true,
|
||||
'zts' => true,
|
||||
'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
|
||||
'timeout_minutes' => 360,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
@ -41,10 +41,12 @@ jobs:
|
||||
debug: [true, false]
|
||||
name: ['']
|
||||
run_tests_parameters: ['']
|
||||
timeout_minutes: [360]
|
||||
zts: [true, false]
|
||||
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
|
||||
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
|
||||
runs-on: ubuntu-20.04
|
||||
timeout-minutes: ${{ matrix.timeout_minutes }}
|
||||
steps:
|
||||
- name: git checkout
|
||||
uses: actions/checkout@v2
|
||||
|
Loading…
Reference in New Issue
Block a user