From 1de7d6aeae3a33f8426be0a7c9f7388a8e7cdf25 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Wed, 12 Mar 2025 16:43:42 +0300 Subject: [PATCH] CI: use Ninja in sanitizer jobs --- .github/libcxx-setup.sh | 6 +++--- .github/workflows/sanitizer.yml | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/libcxx-setup.sh b/.github/libcxx-setup.sh index d00e495e..8966194d 100755 --- a/.github/libcxx-setup.sh +++ b/.github/libcxx-setup.sh @@ -17,7 +17,8 @@ fi ## Build and install libc++ (Use unstable ABI for better sanitizer coverage) mkdir llvm-build && cd llvm-build -cmake -DCMAKE_C_COMPILER=${CC} \ +cmake -GNinja \ + -DCMAKE_C_COMPILER=${CC} \ -DCMAKE_CXX_COMPILER=${CXX} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -29,7 +30,6 @@ cmake -DCMAKE_C_COMPILER=${CC} \ -DLIBCXX_INCLUDE_TESTS=OFF \ -DLIBCXX_INCLUDE_BENCHMARKS=OFF \ -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi' \ - -G "Unix Makefiles" \ ../llvm-project/runtimes/ -make -j cxx cxxabi +cmake --build . -- cxx cxxabi cd .. diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml index dcf373a8..9eb99475 100644 --- a/.github/workflows/sanitizer.yml +++ b/.github/workflows/sanitizer.yml @@ -18,6 +18,11 @@ jobs: sanitizer: ['asan', 'ubsan', 'tsan', 'msan'] steps: + - name: Installing build dependencies + run: | + sudo apt update + sudo apt install ninja-build + - uses: actions/checkout@v4 - name: configure msan env @@ -75,7 +80,7 @@ jobs: working-directory: ${{ runner.workspace }}/_build run: > VERBOSE=1 - cmake $GITHUB_WORKSPACE + cmake -GNinja $GITHUB_WORKSPACE -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF -DBENCHMARK_ENABLE_LIBPFM=OFF -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON