From 6de13e329ec53866ba70b875563f75535664220c Mon Sep 17 00:00:00 2001
From: Marco Wettstein <maw@panter.ch>
Date: Thu, 8 Apr 2021 17:39:52 +0200
Subject: [PATCH] fix: storybook build

---
 includes/docker-build.yml | 24 +++++-------------------
 includes/rules.yml        | 11 +++++++++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/includes/docker-build.yml b/includes/docker-build.yml
index c997d29..9c37c47 100644
--- a/includes/docker-build.yml
+++ b/includes/docker-build.yml
@@ -53,33 +53,19 @@
 
 .docker-build-storybook:
   stage: docker-build
-  only:
-    refs:
-      - master
-      - main
-      - production
-      - tags
-      - merge_requests
-    variables:
-      - $STORYBOOK == "true"
-  extends: .docker-build-storybook-base
+
+  extends:
+    - .rules-stoybook
+    - .docker-build-storybook-base
   needs: ["storybook-build"]
 
 .storybook-build:
   extends:
+    - .rules-stoybook
     - .cache-node-modules
   cache:
     policy: pull
   stage: build
-  only:
-    refs:
-      - master
-      - main
-      - production
-      - tags
-      - merge_requests
-    variables:
-      - $STORYBOOK == "true"
 
   needs: ["setup-build-info"]
   # don't do it after the semantic release commit, but do it after tag
diff --git a/includes/rules.yml b/includes/rules.yml
index 5064ec6..5500e40 100644
--- a/includes/rules.yml
+++ b/includes/rules.yml
@@ -43,3 +43,14 @@
       when: on_success
     - if: $CI_COMMIT_TAG
       when: manual
+
+.rules-stoybook:
+  rules:
+    - if: $STORYBOOK != "true"
+      when: never
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_MESSAGE =~ /^chore\(release\).*/ # not after semantic release commit
+      when: never
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.([0-9]+|x)\.x$/ # hotfix branches
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-- 
GitLab