Actually fail release-check when tag not in master, move that check t…

…o the end
BytemarkHosting · Jun 14, 2017 · f82efc4 · f82efc4
1 parent 7b273e8
commit f82efc4
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -92,11 +92,6 @@ release-check:
   image: alpine
   before_script: *version_script
   script:
-  - apk update && apk add git
-  - |
-    if ! git branch --contains $CI_BUILD_REF_NAME | grep -E '^[[:space:]]*master$'; then
-      echo "version-tagged commit has not been merged into master - will not release!"
-    fi
   - |
     if ! [ "$VERSION" = "$CHANGELOG_VERSION" ] ; then
       echo "Mismatch between branch name and changelog version"
@@ -106,6 +101,12 @@ release-check:
       echo "Mismatch between branch name and lib/version.go version"
       exit 1
     fi
+  - apk update && apk add git
+  - |
+    if ! git branch --contains $CI_BUILD_REF_NAME | grep -E '^[[:space:]]*master$'; then
+      echo "version-tagged commit has not been merged into master - will not release!"
+      exit 1
+    fi
   only:
   - /^v\d+(\.\d+)+$/