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