From 39397dbb45bc81c4ac8abdd67be2d663119a04f3 Mon Sep 17 00:00:00 2001 From: Kirill Azovtsev Date: Thu, 28 Nov 2024 13:50:17 +0300 Subject: [PATCH] return Unix Makefiles --- .github/workflows/test.yml | 4 ++-- housekeeping/docker/kagome-dev/Makefile | 2 +- housekeeping/docker/kagome-dev/kagome_builder.Dockerfile | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 60487a9c1f..65fdda9203 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -210,9 +210,9 @@ jobs: - name: "Self-hosted: Linux: gcc-13 ASAN" params: -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/gcc-13_cxx20.cmake -DASAN=ON - name: "Self-hosted: Linux: clang-16 TSAN WAVM" - params: -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-16_cxx20.cmake -DTSAN=ON -DWASM_COMPILER=WAVM + params: -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-19_cxx20.cmake -DTSAN=ON -DWASM_COMPILER=WAVM - name: "Self-hosted: Linux: clang-16 UBSAN" - params: -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-16_cxx20.cmake -DUBSAN=ON -DUBSAN_TRAP=OFF -DUBSAN_ABORT=ON + params: -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/clang-19_cxx20.cmake -DUBSAN=ON -DUBSAN_TRAP=OFF -DUBSAN_ABORT=ON name: "${{ matrix.options.name }}" runs-on: [ actions-runner-controller ] diff --git a/housekeeping/docker/kagome-dev/Makefile b/housekeeping/docker/kagome-dev/Makefile index c370d0e192..af892880f9 100644 --- a/housekeeping/docker/kagome-dev/Makefile +++ b/housekeeping/docker/kagome-dev/Makefile @@ -243,7 +243,7 @@ kagome_dev_docker_build_sanitizers: source /venv/bin/activate && \ git submodule update --init && \ echo \"Building in $$(pwd)\" && \ - cmake . -B\"$(BUILD_DIR)\" -GNinja -DBACKWARD=OFF -DWERROR=$(WERROR) $(SAN_PARAMS) && \ + cmake . -B\"$(BUILD_DIR)\" -G 'Unix Makefiles' -DBACKWARD=OFF -DWERROR=$(WERROR) $(SAN_PARAMS) && \ cmake --build \"$(BUILD_DIR)\" --target test -- -j${BUILD_THREADS} \ " || DOCKER_EXEC_RESULT=$$? ; \ if [ $$DOCKER_EXEC_RESULT -ne 0 ]; then \ diff --git a/housekeeping/docker/kagome-dev/kagome_builder.Dockerfile b/housekeeping/docker/kagome-dev/kagome_builder.Dockerfile index c91b1dcc68..a248f2384a 100644 --- a/housekeeping/docker/kagome-dev/kagome_builder.Dockerfile +++ b/housekeeping/docker/kagome-dev/kagome_builder.Dockerfile @@ -41,6 +41,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://ap RUN install_packages \ build-essential \ + ninja-build \ ccache \ clang-format-${LLVM_VERSION} \ clang-tidy-${LLVM_VERSION} \