From 34aeebf37e4ff8fdfe3001b59c1cc55725a131d6 Mon Sep 17 00:00:00 2001
From: Axel von Arnim <axel.vonarnim@fortiss.org>
Date: Thu, 27 Sep 2018 08:42:39 +0000
Subject: [PATCH] Merged in NRRPLT-6586_MakefileNoVpn (pull request #1)
[NRRPLT-6586] Makefile uses no VPN anymore
Approved-by: Manos Angelidis <angelidis@fortiss.org>
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 7a38367..c66f025 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ PYTHON_PIP_VERSION?=pip==9.0.3
ifeq ($(NRP_INSTALL_MODE),user)
include user_makefile
else
- CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git
- CI_DIR?=ContinuousIntegration
+ CI_REPO?=git@bitbucket.org:hbpneurorobotics/admin-scripts.git
+ CI_DIR?=$(HBP)/admin-scripts/ContinuousIntegration
+ THIS_DIR:=$(PWD)
FETCH_CI := $(shell \
if [ ! -d $(CI_DIR) ]; then \
- git clone $(CI_REPO) $(CI_DIR) > /dev/null ;\
+ cd $(HBP) && git clone $(CI_REPO) > /dev/null && cd $(THIS_DIR);\
fi;\
echo $(CI_DIR) )
--
GitLab