Skip to content

Commit

Permalink
return Unix Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
qdrvm-ci committed Nov 28, 2024
1 parent fd7ffde commit 39397db
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
2 changes: 1 addition & 1 deletion housekeeping/docker/kagome-dev/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions housekeeping/docker/kagome-dev/kagome_builder.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down

0 comments on commit 39397db

Please sign in to comment.