From f5b09479bdef34bd2314fd3a78a029cc47d12e1e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 9 Jun 2018 20:16:45 -0600 Subject: [PATCH] Attempt to fix git checkout --- .gitlab-ci.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b21aaed..01c8e7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,13 +31,18 @@ before_script: apt-get update -qq && apt-get purge -qq binutils-doc && apt-get install -qq x86-64-unknown-redox-gcc && - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none && + source "$HOME/.cargo/env" && + cargo install cargo-config xargo build: - script: - - | - git pull && - git submodule update --init --recursive && - source "$HOME/.cargo/env" && - cargo install cargo-config xargo && - make ci + script: + - | + [ -d "$CI_PROJECT_DIR" ] || git clone "$CI_BUILD_REPO" "$CI_PROJECT_DIR" && + cd "$CI_PROJECT_DIR" && + git remote set-url origin "$CI_BUILD_REPO" && + git fetch origin && + git checkout "$CI_BUILD_REF" && + git submodule update --init --recursive && + source "$HOME/.cargo/env" && + make ci