Skip to content

Commit ef6bbaa

Browse files
committed
Downgrade to Ubuntu 20.04 for ASAN nightly for now
See actions/runner-images#6709.
1 parent 36559fb commit ef6bbaa

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

.github/nightly_matrix.php

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function get_matrix_include(array $branches) {
5353
'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
5454
'run_tests_parameters' => '--asan',
5555
'test_function_jit' => false,
56+
'asan' => true,
5657
];
5758
if ($branch['ref'] !== 'PHP-8.0') {
5859
$jobs[] = [
@@ -63,6 +64,7 @@ function get_matrix_include(array $branches) {
6364
'run_tests_parameters' => '--repeat 2',
6465
'timeout_minutes' => 360,
6566
'test_function_jit' => true,
67+
'asan' => false,
6668
];
6769
$jobs[] = [
6870
'name' => '_VARIATION',
@@ -72,6 +74,7 @@ function get_matrix_include(array $branches) {
7274
'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
7375
'timeout_minutes' => 360,
7476
'test_function_jit' => true,
77+
'asan' => false,
7578
];
7679
}
7780
}

.github/scripts/setup-slapd.sh

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ sudo sed -e 's|^\s*SLAPD_SERVICES\s*=.*$|SLAPD_SERVICES="ldap:/// ldaps:/// ldap
4242
# Configure LDAP database.
4343
DBDN=`sudo ldapsearch -Q -LLL -Y EXTERNAL -H ldapi:/// -b cn=config '(&(olcRootDN=*)(olcSuffix=*))' dn | grep -i '^dn:' | sed -e 's/^dn:\s*//'`;
4444

45+
if test -f "/etc/ldap/schema/ppolicy.ldif"; then
46+
sudo ldapadd -Q -Y EXTERNAL -H ldapi:/// -f /etc/ldap/schema/ppolicy.ldif
47+
fi
48+
4549
sudo service slapd restart
4650

4751
sudo ldapmodify -Q -Y EXTERNAL -H ldapi:/// << EOF

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
zts: [true, false]
6060
include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
6161
name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
62-
runs-on: ubuntu-${{ matrix.branch.ref == 'master' && '22.04' || '20.04' }}
62+
runs-on: ubuntu-${{ (matrix.branch.ref == 'master' && !matrix.asan) && '22.04' || '20.04' }}
6363
steps:
6464
- name: git checkout
6565
uses: actions/checkout@v3

0 commit comments

Comments
 (0)