From 7706085b09f3cd9b7c09f7f93b182fd425f6525a Mon Sep 17 00:00:00 2001
From: Jon Lockwood <jonathon.lockwood@networkedweb.com>
Date: Wed, 4 Aug 2021 10:43:25 +0930
Subject: [PATCH] fix(gitlab_release): All tasks run as part of script
 including user custom script

Job would suceed if anything failed in after_script.

#1
---
 .gitlab-ci.yml                | 5 +++--
 gitlab_release/.gitlab-ci.yml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1af0a17..56243e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,11 @@ include:
 
 
 Gitlab Release:
+    variables:
+        MY_COMMAND: ./sub-folder_changlog.sh
     extends:
         - .gitlab_release
-    script:
-        - ./sub-folder_changlog.sh
+
 
 
 Github (Push --mirror):
diff --git a/gitlab_release/.gitlab-ci.yml b/gitlab_release/.gitlab-ci.yml
index f8b04dd..ae73590 100644
--- a/gitlab_release/.gitlab-ci.yml
+++ b/gitlab_release/.gitlab-ci.yml
@@ -23,8 +23,7 @@
         - git push --set-upstream origin $CI_COMMIT_BRANCH
         - RELEASE_VERSION_CURRENT=$(cz -n cz_nfc version --project)        
     script:
-        - echo "your script here"
-    after_script:
+        - "$MY_COMMAND"
         - RELEASE_CHANGELOG=$(cz -n cz_nfc bump --changelog --changelog-to-stdout)
         - RELEASE_VERSION_NEW=$(cz -n cz_nfc version --project)
         - RELEASE_TAG=v$RELEASE_VERSION_NEW
@@ -37,6 +36,7 @@
         - echo "[DEBUG] RELEASE_TAG_SHA1[$RELEASE_TAG_SHA1]"
         - git push
         - release-cli create --name "Release $RELEASE_TAG" --tag-name "$RELEASE_TAG" --ref "$RELEASE_TAG_SHA1" --description "$RELEASE_CHANGELOG"
+    after_script:
         - rm -Rf repo
     rules:
         - if: "$CI_COMMIT_AUTHOR =='NFC CI <CI@nfc-gitlab>'"