Switch asan build to Ubuntu 23.04 in Docker

Closes GH-12034
This commit is contained in:
Ilija Tovilo 2023-08-23 12:58:32 +02:00
parent 94e26dc895
commit c9e5e1fc52
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
3 changed files with 32 additions and 7 deletions

View file

@ -6,8 +6,21 @@ runs:
run: |
set -x
sudo apt-get update
sudo apt-get install \
export DEBIAN_FRONTEND=noninteractive
# Install sudo in Docker for consistent actions
if ! type "sudo" > /dev/null; then
apt-get update -y | true
apt-get install -y sudo
fi
sudo apt-get update -y | true
sudo apt-get install -y \
autoconf \
gcc \
make \
curl \
unzip \
bison \
re2c \
locales \
@ -20,6 +33,7 @@ runs:
libtidy-dev \
libenchant-2-dev \
libaspell-dev \
libbz2-dev \
libpspell-dev \
libsasl2-dev \
libxpm-dev \

View file

@ -37,12 +37,21 @@ env:
jobs:
LINUX_X64:
services:
mysql:
image: mysql:8
env:
MYSQL_DATABASE: test
MYSQL_ROOT_PASSWORD: root
postgres:
image: postgres
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: test
env:
MYSQL_TEST_HOST: mysql
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
PDO_MYSQL_TEST_HOST: mysql
strategy:
fail-fast: false
matrix:
@ -55,18 +64,21 @@ jobs:
asan: true
name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
runs-on: ubuntu-22.04
container:
image: ${{ matrix.asan && 'ubuntu:23.04' || null }}
steps:
- name: git checkout
uses: actions/checkout@v3
- name: apt
uses: ./.github/actions/apt-x64
- name: Create MSSQL container
if: ${{ !matrix.asan }}
uses: ./.github/actions/setup-mssql
- name: Create Oracle container
if: ${{ !matrix.asan }}
uses: ./.github/actions/setup-oracle
- name: Setup Caddy server
uses: ./.github/actions/setup-caddy
- name: apt
uses: ./.github/actions/apt-x64
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
@ -88,6 +100,7 @@ jobs:
- name: make install
uses: ./.github/actions/install-linux
- name: Setup
if: ${{ !matrix.asan }}
uses: ./.github/actions/setup-x64
- name: Test
if: matrix.asan == false
@ -104,6 +117,7 @@ jobs:
${{ !matrix.asan && '-d opcache.jit_buffer_size=16M' || '' }}
${{ matrix.asan && '--asan -x' || '' }}
- name: Verify generated files are up to date
if: ${{ !matrix.asan }}
uses: ./.github/actions/verify-generated-files
MACOS_DEBUG_NTS:
runs-on: macos-11

View file

@ -2,9 +2,6 @@
Extension loading
--SKIPIF--
<?php
if (getenv('SKIP_ASAN')) {
die('xleak LSAN bug on Clang 14 crashes this test');
}
$extDir = ini_get('extension_dir');
if (!file_exists($extDir . '/opcache.so') && !file_exists($extDir . '/php_opcache.dll')) {
die('skip Opcache shared object not found in extension_dir');