From 6afc385019b53947ba772950274db738c857e1fe Mon Sep 17 00:00:00 2001 From: Forest Anderson Date: Wed, 24 Apr 2019 15:20:48 -0400 Subject: [PATCH] Changed directory Former-commit-id: c44614852afe13acf613d756dccd31d8d1cfead4 --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5e422fab3..b992ebcf08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,11 +9,12 @@ stages: variables: GIT_STRATEGY: none before_script: - - cd /cache + - mkdir -p /cache/veloren + - cd /cache/veloren - if [ -d .git ]; then echo "is git dir"; else - git clone $CI_REPOSITORY_URL; + git clone $CI_REPOSITORY_URL . ; fi; - rm -f .git/index.lock - rm -f .git/shallow.lock @@ -23,14 +24,14 @@ before_script: - git fetch origin --prune +refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/* - git checkout -f -q $CI_COMMIT_SHA - if [ ! -z "${SOURCE_PROJECT}" -a "${SOURCE_PROJECT}" != " " ]; then - echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}"; - git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}"; + echo "THIS SEEMS TO BE A MERGE PIPELINE FROM ${SOURCE_PROJECT}/${SOURCE_BRANCH}"; + git pull "https://gitlab.com/${SOURCE_PROJECT}/veloren.git" "${SOURCE_BRANCH}"; fi; - git submodule sync --recursive - git submodule update --remote --recursive - git status - if [ -d target ]; then - ls -la target; + ls -la target; fi; #############