diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91322ef7d70555cc45c5200cf130f04259c3e9ab..97821478e8aa6ab20ccc91078d07433f3f5a5332 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ default: - mn2l variables: - GIT_CLONE_PATH: /builds/$CI_PROJECT_PATH/PF/fpm + GIT_CLONE_PATH: /builds/$CI_PROJECT_PATH/FPM_BUILD/fpm # cannot work in /builds/$CI_PROJECT_PATH stages: - .pre @@ -43,7 +43,7 @@ format: stage: build script: - clang-format --version # we use clang-format-10 exclusively - - ${CI_PROJECT_DIR}/../waves/scripts/format_code.py + - ${GIT_CLONE_PATH}/../waves/scripts/format_code.py - mkdir -p patches - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi artifacts: @@ -61,7 +61,7 @@ build: script: - mkdir build - cd build - - cmake -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves -Wno-dev .. + - cmake -DCMAKE_PREFIX_PATH=${GIT_CLONE_PATH}/../waves -Wno-dev .. - make -j $(nproc) artifacts: paths: