@catladder/pipeline 3.48.0 → 4.0.0

package/examples/__snapshots__/referencing-other-vars.test.ts.snap

@@ -156,7 +156,7 @@ before_script:
         - app1/.yarn
     - key: app1-node-modules
       policy: pull-push
-      paths:
+      paths: &a2
         - app1/node_modules
         - app1/.yarn/install-state.gz
   rules:
@@ -197,9 +197,7 @@ before_script:
         - app1/.yarn
     - key: app1-node-modules
       policy: pull-push
-      paths:
-        - app1/node_modules
-        - app1/.yarn/install-state.gz
+      paths: *a2
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -569,7 +567,7 @@ before_script:
         - app1-yarn
     - key: app1-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a3
         - app1/node_modules
         - app1/.yarn/install-state.gz
       fallback_keys:
@@ -614,9 +612,7 @@ before_script:
         - app1-yarn
     - key: app1-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - app1/node_modules
-        - app1/.yarn/install-state.gz
+      paths: *a3
       fallback_keys:
         - app1-node-modules
   rules:
@@ -1600,7 +1596,7 @@ before_script:
         - app2/.yarn
     - key: app2-node-modules
       policy: pull-push
-      paths:
+      paths: &a4
         - app2/node_modules
         - app2/.yarn/install-state.gz
   rules:
@@ -1641,9 +1637,7 @@ before_script:
         - app2/.yarn
     - key: app2-node-modules
       policy: pull-push
-      paths:
-        - app2/node_modules
-        - app2/.yarn/install-state.gz
+      paths: *a4
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -2023,7 +2017,7 @@ before_script:
         - app2-yarn
     - key: app2-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a5
         - app2/node_modules
         - app2/.yarn/install-state.gz
       fallback_keys:
@@ -2068,9 +2062,7 @@ before_script:
         - app2-yarn
     - key: app2-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - app2/node_modules
-        - app2/.yarn/install-state.gz
+      paths: *a5
       fallback_keys:
         - app2-node-modules
   rules:
@@ -3084,7 +3076,7 @@ before_script:
         - kube/.yarn
     - key: kube-node-modules
       policy: pull-push
-      paths:
+      paths: &a6
         - kube/node_modules
         - kube/.yarn/install-state.gz
   rules:
@@ -3125,9 +3117,7 @@ before_script:
         - kube/.yarn
     - key: kube-node-modules
       policy: pull-push
-      paths:
-        - kube/node_modules
-        - kube/.yarn/install-state.gz
+      paths: *a6
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -3587,7 +3577,7 @@ before_script:
         - kube-yarn
     - key: kube-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a7
         - kube/node_modules
         - kube/.yarn/install-state.gz
       fallback_keys:
@@ -3632,9 +3622,7 @@ before_script:
         - kube-yarn
     - key: kube-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - kube/node_modules
-        - kube/.yarn/install-state.gz
+      paths: *a7
       fallback_keys:
         - kube-node-modules
   rules:
@@ -4839,13 +4827,13 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - &a2
+    - &a8
       if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
       when: never
-    - &a3
+    - &a9
       if: $CI_PIPELINE_SOURCE  == "trigger"
       when: never
-    - &a4
+    - &a10
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -4860,9 +4848,9 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - *a2
-    - *a3
-    - *a4
+    - *a8
+    - *a9
+    - *a10
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -156,7 +156,7 @@ before_script:
         - api/.yarn
     - key: api-node-modules
       policy: pull-push
-      paths:
+      paths: &a2
         - api/node_modules
         - api/.yarn/install-state.gz
   rules:
@@ -197,9 +197,7 @@ before_script:
         - api/.yarn
     - key: api-node-modules
       policy: pull-push
-      paths:
-        - api/node_modules
-        - api/.yarn/install-state.gz
+      paths: *a2
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -384,7 +382,7 @@ before_script:
         - api-yarn
     - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a3
         - api/node_modules
         - api/.yarn/install-state.gz
       fallback_keys:
@@ -429,9 +427,7 @@ before_script:
         - api-yarn
     - key: api-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - api/node_modules
-        - api/.yarn/install-state.gz
+      paths: *a3
       fallback_keys:
         - api-node-modules
   rules:
@@ -854,7 +850,7 @@ before_script:
         - www/.yarn
     - key: www-node-modules
       policy: pull-push
-      paths:
+      paths: &a4
         - www/node_modules
         - www/.yarn/install-state.gz
   rules:
@@ -895,9 +891,7 @@ before_script:
         - www/.yarn
     - key: www-node-modules
       policy: pull-push
-      paths:
-        - www/node_modules
-        - www/.yarn/install-state.gz
+      paths: *a4
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1084,7 +1078,7 @@ before_script:
         - www-yarn
     - key: www-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a5
         - www/node_modules
         - www/.yarn/install-state.gz
       fallback_keys:
@@ -1129,9 +1123,7 @@ before_script:
         - www-yarn
     - key: www-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - www/node_modules
-        - www/.yarn/install-state.gz
+      paths: *a5
       fallback_keys:
         - www-node-modules
   rules:
@@ -1516,13 +1508,13 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - &a2
+    - &a6
       if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
       when: never
-    - &a3
+    - &a7
       if: $CI_PIPELINE_SOURCE  == "trigger"
       when: never
-    - &a4
+    - &a8
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -1537,9 +1529,9 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - *a2
-    - *a3
-    - *a4
+    - *a6
+    - *a7
+    - *a8
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -156,7 +156,7 @@ before_script:
         - .yarn
     - key: .-node-modules
       policy: pull-push
-      paths:
+      paths: &a2
         - node_modules
         - .yarn/install-state.gz
   rules:
@@ -197,9 +197,7 @@ before_script:
         - .yarn
     - key: .-node-modules
       policy: pull-push
-      paths:
-        - node_modules
-        - .yarn/install-state.gz
+      paths: *a2
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -356,7 +354,7 @@ before_script:
         - .-yarn
     - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a3
         - node_modules
         - .yarn/install-state.gz
       fallback_keys:
@@ -401,9 +399,7 @@ before_script:
         - .-yarn
     - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - node_modules
-        - .yarn/install-state.gz
+      paths: *a3
       fallback_keys:
         - .-node-modules
   rules:
@@ -2296,13 +2292,13 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - &a2
+    - &a4
       if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
       when: never
-    - &a3
+    - &a5
       if: $CI_PIPELINE_SOURCE  == "trigger"
       when: never
-    - &a4
+    - &a6
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -2317,9 +2313,9 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - *a2
-    - *a3
     - *a4
+    - *a5
+    - *a6
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -156,7 +156,7 @@ before_script:
         - .yarn
     - key: .-node-modules
       policy: pull-push
-      paths:
+      paths: &a2
         - node_modules
         - .yarn/install-state.gz
   rules:
@@ -197,9 +197,7 @@ before_script:
         - .yarn
     - key: .-node-modules
       policy: pull-push
-      paths:
-        - node_modules
-        - .yarn/install-state.gz
+      paths: *a2
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -354,7 +352,7 @@ before_script:
         - .-yarn
     - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
+      paths: &a3
         - node_modules
         - .yarn/install-state.gz
       fallback_keys:
@@ -399,9 +397,7 @@ before_script:
         - .-yarn
     - key: .-node-modules-mr$CI_MERGE_REQUEST_IID
       policy: pull-push
-      paths:
-        - node_modules
-        - .yarn/install-state.gz
+      paths: *a3
       fallback_keys:
         - .-node-modules
   rules:
@@ -2280,13 +2276,13 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - &a2
+    - &a4
       if: $CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/
       when: never
-    - &a3
+    - &a5
       if: $CI_PIPELINE_SOURCE  == "trigger"
       when: never
-    - &a4
+    - &a6
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -2301,9 +2297,9 @@ create release:
   after_script:
     - echo '👉 If this job failed with access denied, the project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
-    - *a2
-    - *a3
     - *a4
+    - *a5
+    - *a6
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

package/package.json

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

package/src/build/index.ts

@@ -19,7 +19,9 @@ export * from "./types";
 
 export type BuildTypes = {
   [type in BuildConfigStandaloneType]: {
-    jobs: (context: ComponentContextWithBuild) => CatladderJob[];
+    jobs: (
+      context: ComponentContextWithBuild,
+    ) => CatladderJob[] | Promise<CatladderJob[]>;
     defaults: (
       envContext: EnvironmentContext,
     ) => Partial<Extract<BuildConfig, { type: type }>>;
@@ -76,7 +78,9 @@ export const BUILD_TYPES: BuildTypes = {
 
 export type WorkspaceBuildTypes = {
   [type in WorkspaceBuildConfig["type"]]: {
-    jobs: (context: WorkspaceContext) => CatladderJob[];
+    jobs: (
+      context: WorkspaceContext,
+    ) => CatladderJob[] | Promise<CatladderJob[]>;
     defaults: () => Partial<Extract<WorkspaceBuildConfig, { type: type }>>;
   };
 };

package/src/build/node/buildJob.ts

@@ -19,40 +19,43 @@ import type { BuildConfigDocker } from "../types";
 import { getNodeCache, getYarnCache } from "./cache";
 import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
 
-export const createNodeBuildJobs = (
+export const createNodeBuildJobs = async (
   context: ComponentContextWithBuild | WorkspaceContext,
-): CatladderJob[] => {
+): Promise<CatladderJob[]> => {
   if (context.type === "workspace") {
     return createWorkspaceBuildJobs(context, {
-      appBuild: createNodeBuildJobDefinition(context),
+      appBuild: await createNodeBuildJobDefinition(context),
     });
   }
   return createComponentBuildJobs(context, {
     appBuild: componentContextIsStandaloneBuild(context)
-      ? createNodeBuildJobDefinition(context)
+      ? await createNodeBuildJobDefinition(context)
       : undefined,
 
-    dockerBuild: createNodeDockerJobDefinition(context),
+    dockerBuild: await createNodeDockerJobDefinition(context),
   });
 };
 
-export const createNodeBuildJobDefinition = (
+export const createNodeBuildJobDefinition = async (
   context: ComponentContext<BuildContextStandalone> | WorkspaceContext,
-): AppBuildJobDefinition | undefined => {
+): Promise<AppBuildJobDefinition | undefined> => {
   const buildConfig = context.build.config;
 
-  const yarnInstall = getYarnInstall(context);
+  const [yarnInstall, nodeCache] = await Promise.all([
+    getYarnInstall(context),
+    getNodeCache(context),
+  ]);
   return createBuildJobDefinition(context, buildConfig, {
     prescript: yarnInstall,
-    cache: getNodeCache(context),
+    cache: nodeCache,
   });
 };
 
 type NewType = ComponentContextWithBuild;
 
-export const createNodeDockerJobDefinition = (
+export const createNodeDockerJobDefinition = async (
   context: NewType,
-): DockerBuildJobDefinition => {
+): Promise<DockerBuildJobDefinition> => {
   // get the default docker built-in type based on the build type
   const dockerDefaultBuiltIn: BuildConfigDocker["type"] =
     context.build.buildType === "node-static" ||
@@ -60,19 +63,25 @@ export const createNodeDockerJobDefinition = (
       ? "nginx"
       : "node";
 
+  const [yarnCache, dockerAppCopyAndBuildScript, packageManagerInfo] =
+    await Promise.all([
+      getYarnCache(context, "pull"),
+      getDockerAppCopyAndBuildScript(context),
+      context.packageManagerInfo,
+    ]);
+
   return {
     script: getDockerBuildScriptWithBuiltInDockerFile(
       context,
       dockerDefaultBuiltIn,
     ),
-    cache: [...getYarnCache(context, "pull")],
+    cache: [...yarnCache],
     variables: {
       // only required for non static
-      DOCKER_COPY_AND_INSTALL_APP: getDockerAppCopyAndBuildScript(context),
-      DOCKER_COPY_WORKSPACE_FILES:
-        context.packageManagerInfo?.pathsToCopyInDocker
-          .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
-          ?.join("\n"),
+      DOCKER_COPY_AND_INSTALL_APP: dockerAppCopyAndBuildScript,
+      DOCKER_COPY_WORKSPACE_FILES: packageManagerInfo?.pathsToCopyInDocker
+        .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
+        ?.join("\n"),
     },
   };
 };

package/src/build/node/cache.ts

@@ -5,13 +5,15 @@ import slugify from "slugify";
 import type { Context, WorkspaceContext } from "../../types/context";
 import type { CacheConfig } from "../types";
 
-export const getYarnCache = (
+export const getYarnCache = async (
   context: Context,
   policy = "pull-push",
-): CacheConfig[] => {
+): Promise<CacheConfig[]> => {
+  const packageManagerInfo = await context.packageManagerInfo;
   const componentIsInWorkspace =
     context.type === "component" &&
-    context.packageManagerInfo.componentIsInWorkspace;
+    "componentIsInWorkspace" in packageManagerInfo &&
+    packageManagerInfo.componentIsInWorkspace;
   return [
     {
       scope: componentIsInWorkspace ? "global" : "buildDir",
@@ -23,15 +25,17 @@ export const getYarnCache = (
   ];
 };
 
-export const getNodeModulesCache = (
+export const getNodeModulesCache = async (
   context: Context,
   policy = "pull-push",
-): CacheConfig[] => {
+): Promise<CacheConfig[]> => {
+  const packageManagerInfo = await context.packageManagerInfo;
   const componentIsInWorkspace =
     context.type === "component" &&
-    context.packageManagerInfo.componentIsInWorkspace;
+    "componentIsInWorkspace" in packageManagerInfo &&
+    packageManagerInfo.componentIsInWorkspace;
 
-  const { isClassic } = context.packageManagerInfo;
+  const { isClassic, workspaces } = packageManagerInfo;
 
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
@@ -49,13 +53,12 @@ export const getNodeModulesCache = (
         ...(componentIsInWorkspace
           ? uniq([
               "node_modules",
-              ...(context.packageManagerInfo.workspaces.map((w) =>
-                join(w.location, "node_modules"),
-              ) ?? []),
+              ...(workspaces.map((w) => join(w.location, "node_modules")) ??
+                []),
               ...(!isClassic
                 ? [
                     ".yarn/install-state.gz",
-                    ...(context.packageManagerInfo.workspaces.map((w) =>
+                    ...(workspaces.map((w) =>
                       join(w.location, ".yarn/install-state.gz"),
                     ) ?? []),
                   ]
@@ -71,12 +74,12 @@ export const getNodeModulesCache = (
     },
   ];
 };
-export const getNodeCache = (
+export const getNodeCache = async (
   context: Context,
   policy = "pull-push",
-): CacheConfig[] => {
+): Promise<CacheConfig[]> => {
   return [
-    ...getYarnCache(context, policy),
-    ...getNodeModulesCache(context, policy),
+    ...(await getYarnCache(context, policy)),
+    ...(await getNodeModulesCache(context, policy)),
   ];
 };

package/src/build/node/index.ts

@@ -7,20 +7,28 @@ import { createNodeBuildJobs } from "./buildJob";
 import { createMeteorBuildJobs } from "./meteor";
 import { createNodeTestJobs } from "./testJob";
 
-export const createNodeJobs = (
+export const createNodeJobs = async (
   context: ComponentContextWithBuild | WorkspaceContext,
-): CatladderJob[] => {
-  return [...createNodeTestJobs(context), ...createNodeBuildJobs(context)];
+): Promise<CatladderJob[]> => {
+  const [testJobs, buildJobs] = await Promise.all([
+    createNodeTestJobs(context),
+    createNodeBuildJobs(context),
+  ]);
+  return [...testJobs, ...buildJobs];
 };
 
-export const createStorybookJobs = (
+export const createStorybookJobs = async (
   context: ComponentContextWithBuild,
-): CatladderJob[] => {
-  return [...createNodeBuildJobs(context)];
+): Promise<CatladderJob[]> => {
+  return [...(await createNodeBuildJobs(context))];
 };
 
-export const createMeteorJobs = (
+export const createMeteorJobs = async (
   context: ComponentContextWithBuild,
-): CatladderJob[] => {
-  return [...createNodeTestJobs(context), ...createMeteorBuildJobs(context)];
+): Promise<CatladderJob[]> => {
+  const [testJobs, buildJobs] = await Promise.all([
+    createNodeTestJobs(context),
+    createMeteorBuildJobs(context),
+  ]);
+  return [...testJobs, ...buildJobs];
 };

package/src/build/node/meteor.ts

@@ -26,10 +26,11 @@ const getMeteorCache = (context: ComponentContext): CacheConfig[] => [
     ],
   },
 ];
-const getMeteorDockerInstallScripts = (
+const getMeteorDockerInstallScripts = async (
   context: ComponentContextWithBuild,
-): BashExpression => {
-  if (context.packageManagerInfo.isClassic) {
+): Promise<BashExpression> => {
+  const packageManagerInfo = await context.packageManagerInfo;
+  if (packageManagerInfo.isClassic) {
     return new BashExpression(
       `
 COPY $APP_DIR/package.json $APP_DIR/yarn.lock ./
@@ -43,7 +44,7 @@ RUN yarn --frozen-lockfile --production=true --ignore-engines
 
   // yarn >= 4 ships with built-in plugins, see https://github.com/yarnpkg/berry/pull/4253
   const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) =>
-    context.packageManagerInfo.version.startsWith(v),
+    packageManagerInfo.version.startsWith(v),
   );
   const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
     ? "RUN yarn plugin import workspace-tools"
@@ -59,22 +60,28 @@ RUN yarn workspaces focus --production
   );
 };
 
-export const createMeteorBuildJobs = (
+export const createMeteorBuildJobs = async (
   context: ComponentContextWithBuild,
-): CatladderJob[] => {
+): Promise<CatladderJob[]> => {
   const buildConfig = context.build.config;
 
   if (!isOfBuildType(buildConfig, "meteor")) {
     throw new Error("deploy config is not meteor");
   }
 
-  const yarnInstall = getYarnInstall(context);
+  const [yarnInstall, nodeCache, meteorInstallScripts] = await Promise.all([
+    getYarnInstall(context),
+    getNodeCache(context),
+    buildConfig.installScripts
+      ? getMeteorDockerInstallScripts(context)
+      : Promise.resolve("" as const),
+  ]);
 
   return createComponentBuildJobs(context, {
     appBuild:
       buildConfig.buildCommand !== null && buildConfig.buildCommand !== false
         ? {
-            cache: [...getNodeCache(context), ...getMeteorCache(context)],
+            cache: [...nodeCache, ...getMeteorCache(context)],
             image: getRunnerImage("jobs-meteor"),
             variables: {
               METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
@@ -91,9 +98,7 @@ export const createMeteorBuildJobs = (
     dockerBuild: {
       script: getDockerBuildScriptWithBuiltInDockerFile(context, "meteor"),
       variables: {
-        METEOR_INSTALL_SCRIPTS: buildConfig.installScripts
-          ? getMeteorDockerInstallScripts(context)
-          : "",
+        METEOR_INSTALL_SCRIPTS: meteorInstallScripts,
       },
     },
   });