From c2b6c56a158498db547b62832962bef5596e501d Mon Sep 17 00:00:00 2001 From: Florian Engelhardt Date: Wed, 6 Nov 2024 14:23:42 +0100 Subject: [PATCH] fix --- .github/workflows/prof_asan.yml | 8 ++++++-- docker-compose.yml | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prof_asan.yml b/.github/workflows/prof_asan.yml index 9ea11c14f9f..cec15b66681 100644 --- a/.github/workflows/prof_asan.yml +++ b/.github/workflows/prof_asan.yml @@ -6,8 +6,11 @@ on: jobs: prof-asan: runs-on: ubuntu-latest + strategy: + matrix: + php-version: [8.3, 8.4] container: - image: datadog/dd-trace-ci:php-8.3_bookworm-5 + image: datadog/dd-trace-ci:php-{$matrix.php-version}_bookworm-5 # https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user options: --user root --privileged @@ -33,11 +36,12 @@ jobs: run: | set -eux switch-php nts-asan + rm $(php-config --ini-dir)/sqlsrv.ini #sqlsrv leaks memory and triggers asan cd profiling export CARGO_TARGET_DIR=/tmp/build-cargo export CC=clang-17 export CFLAGS='-fsanitize=address -fno-omit-frame-pointer' - export LDFLAGS='-fsanitize=address' + export LDFLAGS='-fsanitize=address -shared-libasan' export RUSTC_LINKER=lld-17 triplet=$(uname -m)-unknown-linux-gnu RUST_NIGHTLY_VERSION="-2024-11-04" diff --git a/docker-compose.yml b/docker-compose.yml index 877c9e44452..41b7c3a1dbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,8 +85,8 @@ services: '8.4-buster': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.4_buster' } 'php-master-buster': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-master_buster' } # --- Bookworm --- - '8.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.2_bookworm-3' } - '8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-3' } + '8.2-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.2_bookworm-5' } + '8.3-bookworm': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-8.3_bookworm-5' } # --- CentOS 6 --- '7.0-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.0_centos-7' } '7.1-centos7': { <<: *linux_php_service, image: 'datadog/dd-trace-ci:php-7.1_centos-7' }