Skip to content

Commit c9e5e1f

Browse files
committed
Switch asan build to Ubuntu 23.04 in Docker
Closes GH-12034
1 parent 94e26dc commit c9e5e1f

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

.github/actions/apt-x64/action.yml

+16-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,21 @@ runs:
66
run: |
77
set -x
88
9-
sudo apt-get update
10-
sudo apt-get install \
9+
export DEBIAN_FRONTEND=noninteractive
10+
11+
# Install sudo in Docker for consistent actions
12+
if ! type "sudo" > /dev/null; then
13+
apt-get update -y | true
14+
apt-get install -y sudo
15+
fi
16+
17+
sudo apt-get update -y | true
18+
sudo apt-get install -y \
19+
autoconf \
20+
gcc \
21+
make \
22+
curl \
23+
unzip \
1124
bison \
1225
re2c \
1326
locales \
@@ -20,6 +33,7 @@ runs:
2033
libtidy-dev \
2134
libenchant-2-dev \
2235
libaspell-dev \
36+
libbz2-dev \
2337
libpspell-dev \
2438
libsasl2-dev \
2539
libxpm-dev \

.github/workflows/push.yml

+16-2
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,21 @@ env:
3737
jobs:
3838
LINUX_X64:
3939
services:
40+
mysql:
41+
image: mysql:8
42+
env:
43+
MYSQL_DATABASE: test
44+
MYSQL_ROOT_PASSWORD: root
4045
postgres:
4146
image: postgres
4247
env:
4348
POSTGRES_USER: postgres
4449
POSTGRES_PASSWORD: postgres
4550
POSTGRES_DB: test
51+
env:
52+
MYSQL_TEST_HOST: mysql
53+
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
54+
PDO_MYSQL_TEST_HOST: mysql
4655
strategy:
4756
fail-fast: false
4857
matrix:
@@ -55,18 +64,21 @@ jobs:
5564
asan: true
5665
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
5766
runs-on: ubuntu-22.04
67+
container:
68+
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
5869
steps:
5970
- name: git checkout
6071
uses: actions/checkout@v3
72+
- name: apt
73+
uses: ./.github/actions/apt-x64
6174
- name: Create MSSQL container
75+
if: ${{ !matrix.asan }}
6276
uses: ./.github/actions/setup-mssql
6377
- name: Create Oracle container
6478
if: ${{ !matrix.asan }}
6579
uses: ./.github/actions/setup-oracle
6680
- name: Setup Caddy server
6781
uses: ./.github/actions/setup-caddy
68-
- name: apt
69-
uses: ./.github/actions/apt-x64
7082
- name: ccache
7183
uses: hendrikmuhs/[email protected]
7284
with:
@@ -88,6 +100,7 @@ jobs:
88100
- name: make install
89101
uses: ./.github/actions/install-linux
90102
- name: Setup
103+
if: ${{ !matrix.asan }}
91104
uses: ./.github/actions/setup-x64
92105
- name: Test
93106
if: matrix.asan == false
@@ -104,6 +117,7 @@ jobs:
104117
${{ !matrix.asan && '-d opcache.jit_buffer_size=16M' || '' }}
105118
${{ matrix.asan && '--asan -x' || '' }}
106119
- name: Verify generated files are up to date
120+
if: ${{ !matrix.asan }}
107121
uses: ./.github/actions/verify-generated-files
108122
MACOS_DEBUG_NTS:
109123
runs-on: macos-11

sapi/cli/tests/ext_loading.phpt

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
Extension loading
33
--SKIPIF--
44
<?php
5-
if (getenv('SKIP_ASAN')) {
6-
die('xleak LSAN bug on Clang 14 crashes this test');
7-
}
85
$extDir = ini_get('extension_dir');
96
if (!file_exists($extDir . '/opcache.so') && !file_exists($extDir . '/php_opcache.dll')) {
107
die('skip Opcache shared object not found in extension_dir');

0 commit comments

Comments
 (0)