From 0fbcf86981b80b82eb47e1ad0748a4fec3dcfdfd Mon Sep 17 00:00:00 2001
From: Nigel Kukard <nkukard@lbsd.net>
Date: Tue, 3 Jan 2017 18:32:09 +0000
Subject: [PATCH] CI cleanup and standardization

---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75d2865..ff638e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,9 +58,10 @@ sources-upload:
         - apt-get install -y git xz-utils curl lftp gnupg
         - cd "$CI_PROJECT_DIR"
         # Import signing key
-        - echo "$GPG_SIGNKEY" | gpg --import
+        - echo "$SOURCES_GPG_SIGNKEY" | gpg --import
         # Work out naming
-        - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${CI_BUILD_TAG##v}
+        - export SOURCE_TAG="${CI_BUILD_TAG%%-*}"
+        - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${SOURCE_TAG##v}
         # Create tar archive
         - git archive --format=tar --prefix=${ARCHIVE_NAME}/ ${CI_BUILD_TAG} > ../${ARCHIVE_NAME}.tar
         # Create compressed versions
@@ -68,10 +69,10 @@ sources-upload:
         # Sign compressed tar files
         - gpg --sign --detach-sign --armor ../${ARCHIVE_NAME}.tar.xz
         # Upload files, translating .asc into .sign
-        - lftp -e "set ssl:ca-file '/etc/ssl/certs/ca-certificates.crt'; set net:max-retries '5'; set net:timeout '60'; rm -r -f '${CI_BUILD_TAG}'; mkdir '${CI_BUILD_TAG}' && put ../'${ARCHIVE_NAME}.tar.xz' -o '${CI_BUILD_TAG}/${ARCHIVE_NAME}.tar.xz' && put ../'${ARCHIVE_NAME}.tar.xz.asc' -o '${CI_BUILD_TAG}/${ARCHIVE_NAME}.tar.xz.sign'; quit" -u "$UPLOAD_CRED" "$UPLOAD_HOST" 2>&1
+        - lftp -e "set ssl:ca-file '/etc/ssl/certs/ca-certificates.crt'; set net:max-retries '5'; set net:timeout '60'; rm -r -f '${SOURCE_TAG}'; mkdir '${SOURCE_TAG}' && put ../'${ARCHIVE_NAME}.tar.xz' -o '${SOURCE_TAG}/${ARCHIVE_NAME}.tar.xz' && put ../'${ARCHIVE_NAME}.tar.xz.asc' -o '${SOURCE_TAG}/${ARCHIVE_NAME}.tar.xz.sign'; quit" -u "$UPLOAD_CRED" "$UPLOAD_HOST" 2>&1
         # Test uploaded files
-        - curl --fail -o /dev/null "$DOWNLOAD_URL/${CI_BUILD_TAG}/${ARCHIVE_NAME}.tar.xz"
-        - curl --fail -o /dev/null "$DOWNLOAD_URL/${CI_BUILD_TAG}/${ARCHIVE_NAME}.tar.xz.sign"
+        - curl --fail -o /dev/null "$DOWNLOAD_URL/${SOURCE_TAG}/${ARCHIVE_NAME}.tar.xz"
+        - curl --fail -o /dev/null "$DOWNLOAD_URL/${SOURCE_TAG}/${ARCHIVE_NAME}.tar.xz.sign"
 
 
 
-- 
GitLab