From 299b992209afaa81f7ad96accebe16dc5a3d43d8 Mon Sep 17 00:00:00 2001
From: Sam Nicholls <sam.nicholls@nanoporetech.com>
Date: Mon, 26 Jun 2023 11:07:06 +0000
Subject: [PATCH] Use deploy-check snippets

---
 .gitlab-ci.yml | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 669b7cb..fe742e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,8 @@ include:
       file: "push-github.yaml"
     - project: "epi2melabs/ci-templates"
       file: "push-conda.yaml"
+    - project: "epi2melabs/ci-templates"
+      file: "snippets.yaml"
 
 image: ${UBUNTUIMAGE}:20.04
 
@@ -19,29 +21,13 @@ stages:
     - release
     - postrelease
 
-# Insist that the version in __init__.py matches the git tag
-.check-versions: &check-versions |
-    PYVER="v"$(grep "__version__ = " ${CI_PROJECT_NAME}/__init__.py | awk '{gsub("\"","",$3); print $3}')
-    TAGVER=${CI_COMMIT_TAG}
-    if [[ "${PYVER}" != "${TAGVER}" ]]; then
-        echo "Mismatching TAG and PACKAGE versions:"
-        echo " -     TAG:'$TAGVER'"
-        echo " - PACKAGE:'$TAGVER'"
-        exit 1
-    else
-        echo "TAG and PACKAGE versions agree: '${PYVER}'"
-    fi
-
-# Insist a CHANGELOG entry has been made for tags
-.check-changelog: &check-changelog |
-    TAGVER=${CI_COMMIT_TAG}
-    MATCHES=$(grep -c "## \[${TAGVER}\]" CHANGELOG.md || exit 0)
-    if [[ "${MATCHES}" != "1" ]]; then
-        echo "Expected one match to '${CI_COMMIT_TAG}' in CHANGELOG, found ${MATCHES}"
-        exit 1
-    else
-        echo "Found CHANGELOG.md entry for tag"
-    fi
+deploy-checks:
+    stage: prerelease
+    script:
+        - !reference [.check, python-version]
+        - !reference [.check, changelog]
+    rules:
+        - if: '$CI_COMMIT_TAG =~ /^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$/'
 
 test:
     stage: test
@@ -54,14 +40,6 @@ test:
         paths:
             - dist/*.tar.gz
 
-deploy-checks:
-    stage: prerelease
-    script:
-        - *check-versions
-        - *check-changelog
-    rules:
-        - if: '$CI_COMMIT_TAG =~ /^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$/'
-
 conda:
     variables:
         PACKAGE_ARCH: "noarch"