From 1254e95fcef4b293a4d49c5880aad0d235d457f7 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <sarah.vaupel@uniworx.de>
Date: Sat, 15 Jul 2023 12:13:22 +0000
Subject: [PATCH] chore(gitlab-ci): separate release-test command and tags

---
 .gitlab-ci.yml | 6 +++---
 package.json   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d84a45673..e3ee418ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,7 +239,7 @@ container:
   retry: 2
   interruptible: true
   rules: &release-rules
-    - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_TAG =~ /^v/
 test container:
   stage: container:build
   script:
@@ -268,7 +268,7 @@ test container:
   retry: 2
   interruptible: true
   rules: &test-release-rules
-    - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == "test"
+    - if: $CI_COMMIT_TAG =~ /^t/
 
 parse changelog:
   stage: prepare release
@@ -376,7 +376,7 @@ test release:
     - echo "Will create test release ${VERSION}..."
   release:
     name: "${VERSION}-test"
-    tag_name: "${CI_COMMIT_TAG}-test"
+    tag_name: '$CI_COMMIT_TAG'
     description: .current-changelog.md
   needs:
     - job: check # sanity
diff --git a/package.json b/package.json
index 142eff3e2..287e6a25b 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "i18n:test": "./missing-translations.sh",
     "prerelease": "./is-clean.sh && npm run test",
     "release": "standard-version -a",
+    "release-test": "standard-version -a -t t",
     "postrelease": "git push --follow-tags origin master",
     "parse-changelog": "changelog-parser ./CHANGELOG.md > changelog.json"
   },