From 2cd1e0f6ecb3391f6f2b70111bd89a464bb3cd7f 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 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c7969e..75d2865 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,13 @@
 stages:
-    - quality
-    - tests
-    - install
-    - upload
+    - code-quality
+    - make-test
+    - make-install
+    - sources-upload
 
 
 
 code-quality:
-    stage: quality
+    stage: code-quality
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -18,7 +18,7 @@ code-quality:
 
 
 make-test:
-    stage: tests
+    stage: make-test
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -32,7 +32,7 @@ make-test:
 
 
 make-install:
-    stage: install
+    stage: make-install
     script:
         - export DEBIAN_FRONTEND=noninteractive
         - apt-get update
@@ -45,8 +45,8 @@ make-install:
 
 
 
-upload-tagged:
-    stage: upload
+sources-upload:
+    stage: sources-upload
     only:
         - tags@allworldit/awit-ssh-client
     except:
@@ -60,7 +60,7 @@ upload-tagged:
         # Import signing key
         - echo "$GPG_SIGNKEY" | gpg --import
         # Work out naming
-        - ARCHIVE_NAME=${CI_PROJECT_NAME}-${CI_BUILD_TAG##v}
+        - export ARCHIVE_NAME=${CI_PROJECT_NAME}-${CI_BUILD_TAG##v}
         # Create tar archive
         - git archive --format=tar --prefix=${ARCHIVE_NAME}/ ${CI_BUILD_TAG} > ../${ARCHIVE_NAME}.tar
         # Create compressed versions
-- 
GitLab