From 9fc482996c4a4f780b1eb8a9a99aca62ba13c883 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Wed, 27 Apr 2022 17:40:40 -0600
Subject: [PATCH] Update deploy-library template
---
.gitlab-ci.yml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b407d42b..560f0444 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,9 +76,15 @@ workflow:
git clone "${CI_REPOSITORY_URL}" "$(basename "${APP_DEPLOY_DIR}")";
fi
- cd "${APP_DEPLOY_DIR}";
+ # fetch tags so checkout doesn't create a branch
- git fetch --tags;
+ # switch to requested tag/branch
- git checkout "${CI_COMMIT_REF_NAME}" || git checkout -b "${CI_COMMIT_REF_NAME}";
- - git pull --ff-only "${CI_REPOSITORY_URL}" "${CI_COMMIT_REF_NAME}";
+ # pull updates if on a branch
+ - |
+ if ! git status | grep -q detached ; then
+ git pull --ff-only "${CI_REPOSITORY_URL}" "${CI_COMMIT_REF_NAME}";
+ fi
stage: deploy
tags:
- deploy
--
GitLab