From 2e0020b5c8df4e4c763ddaf74d10893d4fd821e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Fri, 20 Oct 2023 14:15:22 +0200
Subject: [PATCH] fix: non-publish branches fail on main

---
 .gitlab/publishing.gitlab-ci.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitlab/publishing.gitlab-ci.yml b/.gitlab/publishing.gitlab-ci.yml
index 196e49c4..7c620630 100644
--- a/.gitlab/publishing.gitlab-ci.yml
+++ b/.gitlab/publishing.gitlab-ci.yml
@@ -1,6 +1,11 @@
 .limit_publish_pipelines:
   rules:
-      - if: '($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop") && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
+      - if: '$CI_COMMIT_BRANCH == "develop" && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
+        variables:
+          PUBLISH_TAG: next
+      - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
+        variables:
+          PUBLISH_TAG: latest
 
 deploy:
   stage: publish
@@ -24,8 +29,6 @@ publish image:
   image:
     name: gcr.io/kaniko-project/executor:v1.12.1-debug
     entrypoint: [""]
-  variables:
-    PUBLISH_TAG: next
   script:
     - >
        /kaniko/executor
@@ -50,9 +53,6 @@ publish image:
       - IMAGE_NAME: app
         DEPLOY_DIR: frontend/app
   rules:
-    - if: $CI_COMMIT_BRANCH == 'main'
-      variables:
-        PUBLISH_TAG: latest
     - !reference [.limit_publish_pipelines, rules]
 
 publish packages:
@@ -61,16 +61,12 @@ publish packages:
   variables:
     GIT_STRATEGY: clone
     GIT_DEPTH: 0
-    PUBLISH_TAG: next
   script:
     - pnpm install
     - pnpm build
     - pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
     - pnpm publish -r --publish-branch ${CI_COMMIT_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
   rules:
-    - if: $CI_COMMIT_BRANCH == 'main'
-      variables:
-        PUBLISH_TAG: latest
     - !reference [.limit_publish_pipelines, rules]
 
 publish docs:
@@ -84,5 +80,4 @@ publish docs:
     paths:
       - public
   rules:
-    - if: $CI_COMMIT_BRANCH == 'main'
     - !reference [.limit_publish_pipelines, rules]