Skip to content
Snippets Groups Projects
Commit 195ad2bd authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[ci] Run clang jobs in shell runner.

parent a4a4cabf
No related branches found
No related tags found
No related merge requests found
......@@ -32,7 +32,6 @@ ci_images:
- |
echo "CONTAINER_GCC_GUI_IMAGE=${CONTAINER_REGISTRY}/gcc-gui:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
echo "CONTAINER_CLANG_IMAGE=${CONTAINER_REGISTRY}/clang:${CONTAINER_TAG}" >> build.env
echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env
echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env
echo "WEB_IMAGE=${CONTAINER_REGISTRY}/web:${CONTAINER_TAG}" >> build.env
......@@ -53,11 +52,6 @@ ci_images:
--tag $CONTAINER_GCC_PM_OFF_IMAGE --upload
--cpu-target $CPU_TARGET
--packages build-essential jq moreutils
- poetry run ogscm compiler.py ogs.py --build --ogs off
--compiler clang --ccache
--version_file ../../web/data/versions.json
--tag $CONTAINER_CLANG_IMAGE --upload
--cpu-target $CPU_TARGET
- cd ${CI_PROJECT_DIR}
- docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
- docker push $XUNIT_TO_JUNIT_IMAGE
......
......@@ -2,13 +2,13 @@ clang sanitizer:
stage: check
extends:
- .rules-manual
needs: [ci_images]
tags: [shell, envinf]
needs: []
variables:
BUILD_DIR: "../build/sanitizer"
BUILD_DIR: "./build-sanitizer"
CMAKE_ARGS: "-DENABLE_ASAN=ON -DENABLE_USAN=ON"
UBSAN_OPTIONS: "print_stacktrace=1"
LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/scripts/test/leak_sanitizer.suppressions"
image: $CONTAINER_CLANG_IMAGE
script:
- rm -rf $BUILD_DIR
- mkdir -p $BUILD_DIR
......
......@@ -2,11 +2,11 @@ clang tidy:
stage: check
extends:
- .rules-manual
needs: [ci_images]
tags: [shell, envinf]
needs: []
variables:
BUILD_DIR: "../build/tidy"
CMAKE_ARGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_CXX_CLANG_TIDY=clang-tidy-9"
image: $CONTAINER_CLANG_IMAGE
BUILD_DIR: "./build-tidy"
CMAKE_ARGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF -DCMAKE_CXX_CLANG_TIDY=clang-tidy;--extra-arg=-Wno-error=unknown-warning-option"
script:
- rm -rf $BUILD_DIR
- mkdir -p $BUILD_DIR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment