From 0b04e13bb25735268e858ea29206435bc753102a Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Mon, 5 Oct 2020 15:45:17 +0200
Subject: [PATCH] Update ci
---
.gitlab-ci.yml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9782147..7cf692a 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:
--
GitLab