From 30880ad627c34a2a6f8f313b1a472a2ecf466bbd Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 18 Jul 2025 13:04:53 +0100 Subject: [PATCH] ci: Don't run tsan unit tests, build 3rd party for gcc.tsan heavy-arm64 (#2347) --- .github/scripts/conan/generate_matrix.py | 3 --- .github/workflows/sanitizers.yml | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/scripts/conan/generate_matrix.py b/.github/scripts/conan/generate_matrix.py index c645d487..28f762f0 100755 --- a/.github/scripts/conan/generate_matrix.py +++ b/.github/scripts/conan/generate_matrix.py @@ -22,9 +22,6 @@ def generate_matrix(): itertools.product(MACOS_OS, MACOS_CONTAINERS, MACOS_COMPILERS), ): for sanitizer_ext, build_type in itertools.product(SANITIZER_EXT, BUILD_TYPES): - # libbacktrace doesn't build on arm64 with gcc.tsan - if os == "heavy-arm64" and compiler == "gcc" and sanitizer_ext == ".tsan": - continue configurations.append( { "os": os, diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml index f99c57fe..bfc48203 100644 --- a/.github/workflows/sanitizers.yml +++ b/.github/workflows/sanitizers.yml @@ -40,14 +40,6 @@ jobs: compiler: [gcc, clang] sanitizer_ext: [.asan, .tsan, .ubsan] build_type: [Release, Debug] - exclude: - # Currently, clang.tsan unit tests hang - - compiler: clang - sanitizer_ext: .tsan - build_type: Release - - compiler: clang - sanitizer_ext: .tsan - build_type: Debug uses: ./.github/workflows/build_and_test.yml with: @@ -57,7 +49,8 @@ jobs: conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }} build_type: ${{ matrix.build_type }} static: false - run_unit_tests: true + # Currently, both gcc.tsan and clang.tsan unit tests hang + run_unit_tests: ${{ matrix.sanitizer_ext != '.tsan' }} run_integration_tests: false upload_clio_server: false targets: clio_tests clio_integration_tests