Downgrade to Ubuntu 20.04 for ASAN nightly for now

See https://github.com/actions/runner-images/issues/6709.
This commit is contained in:
Ilija Tovilo 2023-04-18 13:59:07 +02:00
parent 36559fb264
commit ef6bbaa1ec
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
3 changed files with 8 additions and 1 deletions

View file

@ -53,6 +53,7 @@ function get_matrix_include(array $branches) {
'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
'run_tests_parameters' => '--asan',
'test_function_jit' => false,
'asan' => true,
];
if ($branch['ref'] !== 'PHP-8.0') {
$jobs[] = [
@ -63,6 +64,7 @@ function get_matrix_include(array $branches) {
'run_tests_parameters' => '--repeat 2',
'timeout_minutes' => 360,
'test_function_jit' => true,
'asan' => false,
];
$jobs[] = [
'name' => '_VARIATION',
@ -72,6 +74,7 @@ function get_matrix_include(array $branches) {
'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
'timeout_minutes' => 360,
'test_function_jit' => true,
'asan' => false,
];
}
}

View file

@ -42,6 +42,10 @@ sudo sed -e 's|^\s*SLAPD_SERVICES\s*=.*$|SLAPD_SERVICES="ldap:/// ldaps:/// ldap
# Configure LDAP database.
DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootDN=*)(olcSuffix=*))' dn | grep -i '^dn:' | sed -e 's/^dn:\s*//'`;
if test -f "/etc/ldap/schema/ppolicy.ldif"; then
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
fi
sudo service slapd restart
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF

View file

@ -59,7 +59,7 @@ jobs:
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-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
runs-on: ubuntu-${{ (matrix.branch.ref == 'master' && !matrix.asan) && '22.04' || '20.04' }}
steps:
- name: git checkout
uses: actions/checkout@v3