From 0c6fd85b99df2af8fa1e15d3b91e41c881f48e5f Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Tue, 14 Sep 2021 16:57:53 +0200
Subject: [PATCH] improve pipeline even more

---
 .gitlab-ci.yml | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8695b06b..7326cf20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,9 +97,9 @@ publish-artifacts:
         git tag -f ${RELEASE_VERSION}
         git push origin ci-processing:${CI_BUILD_REF_NAME} -o ci.skip
         git push origin ${RELEASE_VERSION}
-    rules:
-        - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
-          when: manual
+    only:
+        - $CI_DEFAULT_BRANCH
+    when: manual
 
 release-patch:
     variables:
@@ -116,22 +116,6 @@ release-major:
         RELEASE_TYPE: major
     <<: *release-template
 
-bump-latest-tag:
-    stage: release
-    image: alpine:latest
-    before_script:
-        - apk update
-        - apk add git
-        - REPOSITORY_URL=$(echo "${CI_REPOSITORY_URL}" | sed -e "s|gitlab-ci-token:.*@|${RELEASE_TOKEN}:${RELEASE_TOKEN_SECRET}@|g")
-        - git remote set-url origin $REPOSITORY_URL
-        - git config user.name $GITLAB_USER_LOGIN
-        - git config user.email $GITLAB_USER_EMAIL
-    script: |
-        git tag -f latest -m "This tag is only being kept for backwards compatibility. To install the DS4 system, please use the following manifest URL instead: https://git.f3l.de/api/v4/projects/dungeonslayers%2Fds4/packages/generic/ds4/latest/system.json"
-        git push origin latest -f -o ci.skip
-    rules:
-        - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
-
 release:
     stage: release
     image: registry.gitlab.com/gitlab-org/release-cli:latest