From 53a58fadd2a5a42570f5694fcfe2e1f6f711822b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <jean-baptiste.keck@imag.fr>
Date: Thu, 13 Jun 2019 00:39:39 +0200
Subject: [PATCH] fix build folder for clang
---
.gitlab-ci.yml | 2 +-
ci/scripts/build.sh | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c3a25250..20561092c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ config:bionic:
stage: configure
script:
- "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-8 $CI_PROJECT_DIR/install/gcc-8 gcc-8 g++-8 gfortran-8"
- - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-6 $CI_PROJECT_DIR/install/clang-8 clang-8 clang++-8 gfortran-8"
+ - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-8 $CI_PROJECT_DIR/install/clang-8 clang-8 clang++-8 gfortran-8"
dependencies:
- env:bionic
artifacts:
diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh
index 1ed7cbb56..f787eca15 100644
--- a/ci/scripts/build.sh
+++ b/ci/scripts/build.sh
@@ -6,8 +6,13 @@ if [ $# -ne 4 ]; then
exit 1
fi
+
BUILD_FOLDER="$1"
-mkdir -p $BUILD_FOLDER
+if [ ! -d "$BUILD_FOLDER" ]; then
+ echo "Folder $1 has not been generated by previous step."
+ exit 1
+fi
+
cd $BUILD_FOLDER
if [ ! -f Makefile ]; then
echo "The makefile has not been generated."
--
GitLab