From ffff1f1e52863398e716f8a9ac5dd6c14eb78a35 Mon Sep 17 00:00:00 2001 From: Robert Bindar Date: Tue, 19 Sep 2023 15:37:03 +0300 Subject: [PATCH 1/2] bump default compiler to gnu 10 and macos images from 11 to 12 for better concepts support --- .../build-ubuntu20.04-backwards-compatibility.yml | 3 ++- .github/workflows/full-ci.yml | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ubuntu20.04-backwards-compatibility.yml b/.github/workflows/build-ubuntu20.04-backwards-compatibility.yml index 8e060f2dbb9..8ea6ed7f35b 100644 --- a/.github/workflows/build-ubuntu20.04-backwards-compatibility.yml +++ b/.github/workflows/build-ubuntu20.04-backwards-compatibility.yml @@ -3,7 +3,8 @@ on: workflow_call: env: - CXX: g++ + CXX: g++-10 + CC: gcc-10 jobs: build: diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml index d7de9f130c4..13ebef77d48 100644 --- a/.github/workflows/full-ci.yml +++ b/.github/workflows/full-ci.yml @@ -41,6 +41,8 @@ jobs: with: ci_backend: GCS matrix_image: ubuntu-20.04 + matrix_compiler_cc: 'gcc-10' + matrix_compiler_cxx: 'g++-10' timeout: 120 bootstrap_args: '--enable-gcs --enable-release-symbols' @@ -64,7 +66,7 @@ jobs: uses: ./.github/workflows/ci-linux_mac.yml with: ci_backend: S3 - matrix_image: macos-11 + matrix_image: macos-12 timeout: 120 bootstrap_args: '--enable=s3,serialization,tools --enable-release-symbols' @@ -72,7 +74,7 @@ jobs: uses: ./.github/workflows/ci-linux_mac.yml with: ci_backend: GCS - matrix_image: macos-11 + matrix_image: macos-12 timeout: 120 bootstrap_args: '--enable-gcs --enable-release-symbols' @@ -96,6 +98,8 @@ jobs: with: ci_option: ASAN matrix_image: ubuntu-20.04 + matrix_compiler_cc: 'gcc-10' + matrix_compiler_cxx: 'g++-10' timeout: 120 bootstrap_args: '--enable-serialization' asan: true @@ -104,7 +108,7 @@ jobs: uses: ./.github/workflows/ci-linux_mac.yml with: ci_backend: AZURE - matrix_image: macos-11 + matrix_image: macos-12 timeout: 120 bootstrap_args: '--enable-azure' From 59022ff828f2b6912ad101735b1a897f2b92a5f0 Mon Sep 17 00:00:00 2001 From: Robert Bindar Date: Tue, 19 Sep 2023 18:14:50 +0300 Subject: [PATCH 2/2] adjust libasan6 so name --- .github/workflows/ci-linux_mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-linux_mac.yml b/.github/workflows/ci-linux_mac.yml index 471be11777e..3b356963507 100644 --- a/.github/workflows/ci-linux_mac.yml +++ b/.github/workflows/ci-linux_mac.yml @@ -147,7 +147,7 @@ jobs: shell: bash env: ASAN_OPTIONS: ${{ inputs.asan && 'detect_leaks=0' || '' }} - LD_PRELOAD: ${{ inputs.asan && '/usr/lib/x86_64-linux-gnu/libasan.so.5' || '' }} + LD_PRELOAD: ${{ inputs.asan && '/usr/lib/x86_64-linux-gnu/libasan.so.6' || '' }} run: | set -e pipefail