From 2f7ff3d625a5348628865e76332d833d8c56a2ed Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 9 Jun 2018 20:46:02 -0600
Subject: [PATCH] Fix CI variables
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5ca8a9a3..9d25317e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,12 +37,11 @@ before_script:
build:
script:
- |
- [ -d "$CI_PROJECT_DIR" -a ! -d "$CI_PROJECT_DIR/.git" ] && rm -rf "$CI_PROJECT_DIR" &&
- [ -d "$CI_PROJECT_DIR" ] || git clone "$CI_BUILD_REPO" "$CI_PROJECT_DIR" &&
- cd "$CI_PROJECT_DIR" &&
- git remote set-url origin "$CI_BUILD_REPO" &&
+ [ -d "$CI_PROJECT_NAME" ] || git clone "$CI_REPOSITORY_URL" "$CI_PROJECT_NAME" &&
+ cd "$CI_PROJECT_NAME" &&
+ git remote set-url origin "$CI_REPOSITORY_URL" &&
git fetch origin &&
- git checkout "$CI_BUILD_REF" &&
+ git checkout "$CI_COMMIT_SHA" &&
git submodule update --init --recursive &&
source "$HOME/.cargo/env" &&
rustup update &&
--
GitLab