@catladder/pipeline 2.7.5 → 2.7.7

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -89,9 +89,7 @@ before_script:
     - cd .
     - yarn npm audit --environment production
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
     - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: &a1
@@ -135,9 +133,7 @@ before_script:
       paths:
         - node_modules
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
     - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
@@ -176,9 +172,7 @@ before_script:
       paths:
         - node_modules
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
     - if: $CI_MERGE_REQUEST_ID
   needs: []
   retry: *a1
@@ -267,9 +261,7 @@ before_script:
     when: always
     reports: {}
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs: []
   retry: *a1
   interruptible: true
@@ -590,9 +582,7 @@ before_script:
       paths:
         - api/.yarn
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
     - job: '🔸 myWorkspace 🔨 app | dev '
       artifacts: true
@@ -610,9 +600,7 @@ before_script:
     paths:
       - __sbom.json
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs: []
   retry: *a1
   interruptible: true
@@ -706,10 +694,8 @@ before_script:
     reports:
       dotenv: gitlab_environment.env
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
     - when: on_success
-      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
     - job: 🔸 myWorkspace 👮 lint
       artifacts: false
@@ -750,10 +736,8 @@ before_script:
   rules:
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
       when: on_success
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
     - when: manual
-      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs: []
   retry: *a1
   interruptible: true
@@ -1442,9 +1426,7 @@ before_script:
       paths:
         - www/.yarn
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
     - job: '🔸 myWorkspace 🔨 app | dev '
       artifacts: true
@@ -1462,9 +1444,7 @@ before_script:
     paths:
       - __sbom.json
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs: []
   retry: *a1
   interruptible: true
@@ -1561,10 +1541,8 @@ before_script:
     reports:
       dotenv: gitlab_environment.env
   rules:
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
     - when: on_success
-      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs:
     - job: 🔸 myWorkspace 👮 lint
       artifacts: false
@@ -1605,10 +1583,8 @@ before_script:
   rules:
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
       when: on_success
-    - when: never
-      if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
     - when: manual
-      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/
   needs: []
   retry: *a1
   interruptible: true

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.7.5",
+  "version": "2.7.7",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/pipeline/createMainPipeline.ts

@@ -1,8 +1,7 @@
 import {
-  RULE_IS_MAIN_BRANCH,
+  RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT,
   RULE_IS_MERGE_REQUEST,
   RULE_IS_TAGGED_RELEASE,
-  RULE_NEVER_ON_RELEASE_COMMIT,
 } from "../rules";
 import type {
   ComponentContext,
@@ -105,12 +104,12 @@ export const createMainPipeline = async <T extends PipelineType>(
   throw new Error(`${pipelineType} is not supported`);
 };
 function getGitlabRulesForTrigger(trigger: PipelineTrigger): GitlabRule[] {
-  // mainBranch: on push to main branch
+  // mainBranch: on push to main branch except it's a release commit
   // mr: on merge request
   // taggedRelease: on tag
   switch (trigger) {
     case "mainBranch":
-      return [RULE_NEVER_ON_RELEASE_COMMIT, RULE_IS_MAIN_BRANCH];
+      return [RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT];
     case "mr":
       return [RULE_IS_MERGE_REQUEST];
     case "taggedRelease":

package/src/rules/index.ts

@@ -2,11 +2,20 @@ import type { GitlabRule } from "../types";
 export const RULE_CONDITION_MAIN_BRANCH =
   "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
 
+export const RULE_CONDITION_RELEASE_COMMIT =
+  "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
+
+export const RULE_CONDITION_NOT_RELEASE_COMMIT =
+  "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
+
 export const RULE_IS_MAIN_BRANCH: GitlabRule = {
   if: RULE_CONDITION_MAIN_BRANCH,
 };
+export const RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT: GitlabRule = {
+  if: RULE_CONDITION_MAIN_BRANCH + " && " + RULE_CONDITION_NOT_RELEASE_COMMIT,
+};
 export const RULE_NEVER_ON_RELEASE_COMMIT: GitlabRule = {
-  if: "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/",
+  if: RULE_CONDITION_RELEASE_COMMIT,
   when: "never",
 };