diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97821478e8aa6ab20ccc91078d07433f3f5a5332..7cf692a78c3b2360e5e046c77ce0420269a6645e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,9 +30,6 @@ waves: - rm waves-master.tar.bz2 - mv waves-master waves - cd waves - - echo ${GIT_CLONE_PATH} - - echo ${CI_PROJECT_DIR}/../waves - - pwd - mkdir build - cd build - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake .. @@ -43,7 +40,7 @@ format: stage: build script: - clang-format --version # we use clang-format-10 exclusively - - ${GIT_CLONE_PATH}/../waves/scripts/format_code.py + - ${CI_PROJECT_DIR}/../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 +58,7 @@ build: script: - mkdir build - cd build - - cmake -DCMAKE_PREFIX_PATH=${GIT_CLONE_PATH}/../waves -Wno-dev .. + - cmake -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves -Wno-dev .. - make -j $(nproc) artifacts: paths: