chore: Fix tsan build on circleci.

TokTok · Dec 11, 2024 · 54fd273 · 54fd273
1 parent 6460c25
commit 54fd273
Show file tree

Hide file tree

Showing 5 changed files with 223 additions and 213 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,7 @@ workflows:
       # - bazel-tsan
       # Dynamic analysis with CMake
       - asan
-      # - tsan
+      - tsan
       - ubsan
       # Static analysis
       - clang-analyze
@@ -55,62 +55,53 @@ jobs:
           //c-toxcore/auto_tests:lossless_packet_test
 
   asan:
-    working_directory: ~/work
-    docker:
-      - image: ubuntu
+    machine: { image: ubuntu-2204:current }
 
     steps:
-      - run: &apt_install
-          apt-get update &&
-          DEBIAN_FRONTEND=noninteractive
-          apt-get install -y
-            ca-certificates
-            clang
-            cmake
-            git
-            libbenchmark-dev
-            libconfig-dev
-            libgmock-dev
-            libgtest-dev
-            libopus-dev
-            libsodium-dev
-            libvpx-dev
-            llvm-dev
-            ninja-build
-            pkg-config
       - checkout
       - run: git submodule update --init --recursive
-      - run: CC=clang .circleci/cmake-asan
+      - run: other/docker/circleci/run asan
 
   tsan:
-    working_directory: ~/work
-    docker:
-      - image: ubuntu
+    machine: { image: ubuntu-2204:current }
 
     steps:
-      - run: *apt_install
       - checkout
       - run: git submodule update --init --recursive
-      - run: CC=clang .circleci/cmake-tsan
+      - run: other/docker/circleci/run tsan
 
   ubsan:
-    working_directory: ~/work
-    docker:
-      - image: ubuntu
+    machine: { image: ubuntu-2204:current }
 
     steps:
-      - run: *apt_install
       - checkout
       - run: git submodule update --init --recursive
-      - run: CC=clang .circleci/cmake-ubsan
+      - run: other/docker/circleci/run ubsan
 
   static-analysis:
     working_directory: ~/work
     docker:
       - image: ubuntu
 
     steps:
-      - run: *apt_install
+      - run: &apt_install
+          apt-get update &&
+          DEBIAN_FRONTEND=noninteractive
+          apt-get install -y
+            ca-certificates
+            clang
+            cmake
+            git
+            libbenchmark-dev
+            libconfig-dev
+            libgmock-dev
+            libgtest-dev
+            libopus-dev
+            libsodium-dev
+            libvpx-dev
+            llvm-dev
+            ninja-build
+            pkg-config
       - run:
           apt-get install -y --no-install-recommends
             ca-certificates