@catladder/pipeline 3.35.0 → 3.36.1

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

@@ -913,8 +913,6 @@ before_script:
     name: dev/api
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -1148,8 +1146,6 @@ before_script:
     name: review/$CI_COMMIT_REF_NAME/api
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -1368,8 +1364,6 @@ before_script:
     name: stage/api
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -1588,8 +1582,6 @@ before_script:
     name: prod/api
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -1818,8 +1810,6 @@ before_script:
     name: dev/www
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -2056,8 +2046,6 @@ before_script:
     name: review/$CI_COMMIT_REF_NAME/www
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -2279,8 +2267,6 @@ before_script:
     name: stage/www
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual
@@ -2502,8 +2488,6 @@ before_script:
     name: prod/www
     action: stop
   rules:
-    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/
-      when: on_success
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
     - when: manual

package/examples/cloud-run-existing-image.test.ts

@@ -0,0 +1,12 @@
+import { it, expect } from "vitest";
+import { createYamlLocalPipeline } from "./__utils__/helpers";
+import config from "./cloud-run-existing-image";
+
+/**
+ * This test is auto-generated.
+ * Modifications will be overwritten on every `yarn test` run!
+ */
+
+it("matches snapshot for cloud-run-existing-image local pipeline YAML", async () => {
+  expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
+});

package/examples/cloud-run-existing-image.ts

@@ -0,0 +1,26 @@
+import type { Config } from "../src";
+
+const config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    www: {
+      dir: "app",
+      build: false,
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+        service: {
+          image: "gcr.io/google-project-id/my-image:latest",
+        },
+      },
+    },
+  },
+} satisfies Config;
+
+export default config;
+
+export const information = {
+  title: "Cloud Run: With existing image",
+};

package/package.json

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

package/src/deploy/base/deploy.ts

@@ -69,40 +69,45 @@ export const createDeployJob = (
           })) ?? [])
         : []),
     ],
-    // we don't want to deploy when there is a broken test
-    needsStages: [
-      ...(componentContextHasWorkspaceBuild(context)
-        ? hasDocker // docker build is per component,
-          ? [
-              // we don't need artifacts, but have to wait for the component build
-              {
-                stage: "build" as BaseStage,
-                artifacts: false,
-              },
-            ]
-          : [
-              {
-                // pick build artifacts from workspace build
-                stage: "build" as BaseStage,
-                artifacts: true,
-                workspaceName: context.build.workspaceName,
-              },
-            ]
-        : [
+
+    needsStages:
+      // if the build is disabled, we don't need to wait for it
+      context.build.type !== "disabled"
+        ? [
+            ...(componentContextHasWorkspaceBuild(context)
+              ? hasDocker // docker build is per component,
+                ? [
+                    // we don't need artifacts, but have to wait for the component build
+                    {
+                      stage: "build" as BaseStage,
+                      artifacts: false,
+                    },
+                  ]
+                : [
+                    {
+                      // pick build artifacts from workspace build
+                      stage: "build" as BaseStage,
+                      artifacts: true,
+                      workspaceName: context.build.workspaceName,
+                    },
+                  ]
+              : [
+                  {
+                    stage: "build" as BaseStage,
+                    artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
+                  },
+                ]),
+            // we don't want to deploy when there is a broken test
             {
-              stage: "build" as BaseStage,
-              artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
+              stage: "test",
+              artifacts: false,
+              // use test from workspace build
+              workspaceName: componentContextHasWorkspaceBuild(context)
+                ? context.build.workspaceName
+                : undefined,
             },
-          ]),
-      {
-        stage: "test",
-        artifacts: false,
-        // use test from workspace build
-        workspaceName: componentContextHasWorkspaceBuild(context)
-          ? context.build.workspaceName
-          : undefined,
-      },
-    ],
+          ]
+        : [],
     when: whenDeploy === "auto" ? "on_success" : "manual",
 
     allow_failure: whenDeploy === "manual" ? true : false,

package/src/deploy/base/stop.ts

@@ -16,12 +16,6 @@ export const createStopJob = (
     needs: [], // can be executed even if the deploy job failed
     allow_failure: true,
     when: "manual", // stop is always manual
-    rules: [
-      {
-        if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/", // automatic on hotfix branches
-        when: "on_success",
-      },
-    ],
     variables: {
       ...context.environment.jobOnlyVars.deploy.envVars,
       ...jobDefinition.variables,