Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Increase job timeout for ASAN/UBSAN build
This commit is contained in:
Ilija Tovilo 2022-10-10 11:37:11 +02:00
commit 2dfb537ba5
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
2 changed files with 5 additions and 0 deletions

View File

@ -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,
];
}
}

View File

@ -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