From 2a2e105b6925ff4b58eb6956a82c89ce83205878 Mon Sep 17 00:00:00 2001 From: Nigel Kukard Date: Tue, 3 Jan 2017 19:45:26 +0000 Subject: [PATCH] More standardization --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff638e6..795ac15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,8 +60,8 @@ sources-upload: # Import signing key - echo "$SOURCES_GPG_SIGNKEY" | gpg --import # Work out naming - - export SOURCE_TAG="${CI_BUILD_TAG%%-*}" - - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${SOURCE_TAG##v} + - export ARCHIVE_VERSION="${CI_BUILD_TAG%%-*}" + - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${ARCHIVE_VERSION##v} # Create tar archive - git archive --format=tar --prefix=${ARCHIVE_NAME}/ ${CI_BUILD_TAG} > ../${ARCHIVE_NAME}.tar # Create compressed versions @@ -69,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 '${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 + - lftp -e "set ssl:ca-file '/etc/ssl/certs/ca-certificates.crt'; set net:max-retries '5'; set net:timeout '60'; rm -r -f '${ARCHIVE_VERSION}'; mkdir '${ARCHIVE_VERSION}' && put ../'${ARCHIVE_NAME}.tar.xz' -o '${ARCHIVE_VERSION}/${ARCHIVE_NAME}.tar.xz' && put ../'${ARCHIVE_NAME}.tar.xz.asc' -o '${ARCHIVE_VERSION}/${ARCHIVE_NAME}.tar.xz.sign'; quit" -u "$UPLOAD_CRED" "$UPLOAD_HOST" 2>&1 # Test uploaded files - - 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" + - curl --fail -o /dev/null "$DOWNLOAD_URL/${ARCHIVE_VERSION}/${ARCHIVE_NAME}.tar.xz" + - curl --fail -o /dev/null "$DOWNLOAD_URL/${ARCHIVE_VERSION}/${ARCHIVE_NAME}.tar.xz.sign" -- GitLab