From d9d2c710be7843fff365a18eab9cb2c4b93425fa Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Wed, 15 May 2019 17:06:38 +0200
Subject: [PATCH] Remove --skip-repo
---
.gitlab-ci.yml | 4 ++--
CI/main_superbuild.cmake | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3dd144023..b7b714c027 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ fast-build:
only: [merge_requests]
stage: build
before_script:
- - git lfs install --skip-repo
+ - git lfs install
# Provision efficiently the local LFS cache before checkout
- git lfs fetch origin $CI_COMMIT_SHA
# Checkout the expected branch
@@ -80,7 +80,7 @@ ubuntu-llvm:
stage: prepare
before_script:
- git checkout -f -q $CI_COMMIT_SHA
- - git lfs install --skip-repo
+ - git lfs install
artifacts:
expire_in: 24 hrs
when: always
diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake
index e750a987ca..e3c5141827 100644
--- a/CI/main_superbuild.cmake
+++ b/CI/main_superbuild.cmake
@@ -68,7 +68,7 @@ if ( DEBUG )
endif()
if (clone_res)
- message( SEND_ERROR "Problem in retreiving the archive of ${BRANCH_NAME}")
+ message( SEND_ERROR "Problem in retreiving the archive")
return()
endif()
@@ -86,6 +86,7 @@ if ( DEBUG )
message("Xdk folder exists at ${XDK_PATH}")
else()
message("Something went wrong no folder in ${XDK_PATH}")
+ message("The branch was ${BRANCH_NAME}")
endif()
endif()
--
GitLab