@catladder/pipeline 1.117.2 → 1.119.0

package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap

@@ -157,6 +157,7 @@ cloudsql:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -845,6 +846,7 @@ cloudsql:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1588,6 +1590,7 @@ cloudsql:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1666,6 +1669,7 @@ cloudsql:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/examples/__snapshots__/kubernetes-with-jobs.ts.snap

@@ -153,6 +153,7 @@ cronjobs:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -748,6 +749,7 @@ application:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1405,6 +1407,7 @@ cronjobs: {}
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1994,6 +1997,7 @@ application:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -2705,6 +2709,7 @@ cronjobs:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -2781,6 +2786,7 @@ cronjobs:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -3649,6 +3655,7 @@ application:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -3725,6 +3732,7 @@ application:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap

@@ -173,6 +173,7 @@ mongodb:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -909,6 +910,7 @@ mongodb:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1716,6 +1718,7 @@ mongodb:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1794,6 +1797,7 @@ mongodb:
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/examples/__snapshots__/native-app.ts.snap

@@ -59,6 +59,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -516,6 +517,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -925,6 +927,7 @@ EOF",
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1388,6 +1391,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1754,6 +1758,7 @@ EOF",
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1829,6 +1834,7 @@ EOF",
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -2418,6 +2424,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -2528,6 +2535,7 @@ EOF",
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/examples/__snapshots__/node-build-with-custom-image.ts.snap

@@ -59,6 +59,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -586,6 +587,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1076,6 +1078,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1151,6 +1154,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/examples/__snapshots__/wait-for-other-deploy.ts.snap

@@ -59,6 +59,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -331,6 +332,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -679,6 +681,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -951,6 +954,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1256,6 +1260,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1328,6 +1333,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1554,6 +1560,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {
@@ -1626,6 +1633,7 @@ exports[`matches snapshot 1`] = `
           "reports": {
             "junit": undefined,
           },
+          "when": "always",
         },
         "cache": [
           {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.117.2",
+  "version": "1.119.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/build/node/buildJob.ts

@@ -4,7 +4,7 @@ import type { Context } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray } from "../../utils";
 import { createBuildJobs } from "../base";
-import { getDockerBuildDefaultScript, requiresDockerBuild } from "../docker";
+import { getDockerBuildDefaultScript } from "../docker";
 import { isOfBuildType } from "../types";
 import { getNextCache, getNodeCache, getYarnCache } from "./cache";
 import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
@@ -39,14 +39,20 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
             ],
             artifacts: {
               paths: [
-                join(context.componentConfig.dir, "__build_info.json"),
-                join(context.componentConfig.dir, "dist"),
-                join(context.componentConfig.dir, ".next"),
+                context.componentConfig.dir,
+                // also copy workspace dependencies in monorepo if packages are shared and they create build artifacts
+                ...(context.packageManagerInfo?.currentWorkspaceDependencies ??
+                  []),
+              ].flatMap((dir) => [
+                join(dir, "__build_info.json"),
+                join(dir, "dist"),
+                join(dir, ".next"),
                 ...(buildConfig.artifactsPaths?.map((path) =>
-                  join(context.componentConfig.dir, path)
+                  join(dir, path)
                 ) ?? []),
-              ],
+              ]),
               expire_in: "1 day",
+              when: "always",
             },
             jobTags: buildConfig.jobTags,
           }

package/src/build/node/cache.ts

@@ -2,6 +2,7 @@ import { join } from "path";
 import slugify from "slugify";
 import type { Context } from "../../types/context";
 import type { GitlabJobCache } from "../../types/gitlab-types";
+import { uniq } from "lodash";
 
 export const getYarnCache = (
   context: Context,
@@ -42,12 +43,12 @@ export const getNodeModulesCache = (
       policy,
       paths: [
         ...(componentIsInWorkspace
-          ? [
+          ? uniq([
               "node_modules",
               ...(context.packageManagerInfo?.workspaces.map((w) =>
                 join(w.location, "node_modules")
               ) ?? []),
-            ]
+            ])
           : [join(context.componentConfig.dir, "node_modules")]),
       ],
     },

package/src/pipeline/packageManager.ts

@@ -59,6 +59,7 @@ export const getPackageManagerInfo = async (
     version,
     isClassic,
     currentWorkspace,
+    currentWorkspaceDependencies,
     componentIsInWorkspace,
     pathsToCopyInDocker,
   };

package/src/types/context.ts

@@ -64,6 +64,7 @@ export type YarnPackageManagerInfo = {
   isClassic: boolean;
   componentIsInWorkspace: boolean;
   pathsToCopyInDocker: string[];
+  currentWorkspaceDependencies: string[];
 };
 
 export type PackageManagerInfo = YarnPackageManagerInfo;