@catladder/pipeline 1.150.1 → 1.150.2

package/src/build/node/meteor.ts

@@ -32,13 +32,13 @@ export const createMeteorBuildJobs = (
     throw new Error("deploy config is not meteor");
   }
 
-  const yarnInstall = getYarnInstall(context.build);
+  const yarnInstall = getYarnInstall(context);
 
   return createBuildJobs(context, {
     appBuild:
       buildConfig.buildCommand !== null
         ? {
-            cache: [...getNodeCache(context.build), ...getMeteorCache(context)],
+            cache: [...getNodeCache(context), ...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

package/src/build/node/testJob.ts

@@ -30,7 +30,7 @@ export const createNodeTestJobs = (
     needs: [],
     envMode: "none",
   };
-  const yarnInstall = getYarnInstall(context.build);
+  const yarnInstall = getYarnInstall(context);
   const auditJob: CatladderJob | null =
     buildConfig.audit !== false
       ? {
@@ -41,7 +41,7 @@ export const createNodeTestJobs = (
           script: [
             `cd ${context.build.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
-              context.build.packageManagerInfo.isClassic
+              context.packageManagerInfo.isClassic
                 ? "yarn audit"
                 : "yarn npm audit --environment production", // yarn 2
             ]),
@@ -61,9 +61,9 @@ export const createNodeTestJobs = (
           name: "👮 lint",
           ...base,
           image: buildConfig.lint?.jobImage ?? defaultImage,
-          cache: getNodeCache(context.build),
+          cache: getNodeCache(context),
           script: [
-            ...ensureNodeVersion(context.build),
+            ...ensureNodeVersion(context),
             `cd ${context.build.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.lint?.command) ?? ["yarn lint"]),
@@ -83,9 +83,9 @@ export const createNodeTestJobs = (
           ...base,
           image:
             buildConfig.test?.jobImage ?? getRunnerImage("jobs-testing-chrome"),
-          cache: getNodeCache(context.build),
+          cache: getNodeCache(context),
           script: [
-            ...ensureNodeVersion(context.build),
+            ...ensureNodeVersion(context),
             `cd ${context.build.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.test?.command) ?? ["yarn test"]),

package/src/build/node/yarn.ts

@@ -1,5 +1,5 @@
 import { BashExpression } from "../../bash/BashExpression";
-import type { BuildContext, ComponentContext } from "../../types";
+import type { BuildContext, ComponentContext, Context } from "../../types";
 import { ensureArray } from "../../utils";
 import { collapseableSection } from "../../utils/gitlab";
 
@@ -8,7 +8,7 @@ const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 // FIXME: check why and when rebuild is needed
 const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
 
-const getYarnInstallCommand = (context: BuildContext) => {
+const getYarnInstallCommand = (context: Context) => {
   if (context.packageManagerInfo.isClassic) {
     return YARN_INSTALL_CLASSIC;
   }
@@ -16,7 +16,7 @@ const getYarnInstallCommand = (context: BuildContext) => {
   return `yarn install --immutable`;
 };
 
-export const ensureNodeVersion = (context: BuildContext) =>
+export const ensureNodeVersion = (context: Context) =>
   collapseableSection(
     "nodeinstall",
     "Ensure node version",
@@ -26,13 +26,15 @@ export const ensureNodeVersion = (context: BuildContext) =>
   ]);
 
 export const getYarnInstall = (
-  context: BuildContext,
+  context: Context,
   options?: {
     noCustomPostInstall: boolean;
   },
 ) => {
   const postInstall =
-    "postInstall" in context.config ? context.config.postInstall : null;
+    "postInstall" in context.build.config
+      ? context.build.config.postInstall
+      : null;
   return [
     ...ensureNodeVersion(context),
     ...collapseableSection(
@@ -50,7 +52,7 @@ export const getYarnInstall = (
 
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 
-export const getDockerAppCopyAndBuildScript = (context: BuildContext) => {
+export const getDockerAppCopyAndBuildScript = (context: Context) => {
   if (context.packageManagerInfo.isClassic) {
     return new BashExpression(
       `

package/src/build/sbom.ts

@@ -11,7 +11,7 @@ export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
   const defaultImage = "aquasec/trivy:0.38.3";
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.build.packageManagerInfo.componentIsInWorkspace
+      context.packageManagerInfo.componentIsInWorkspace
         ? "."
         : context.build.dir
     }`,

package/src/context/createComponentContext.ts

@@ -67,7 +67,6 @@ export const createComponentContext = async (
 
     build: {
       dir: dir,
-      packageManagerInfo: packageManagerInfo,
       config: build,
     },
     deploy: deploy

package/src/deploy/custom/deployJob.ts

@@ -19,7 +19,7 @@ export const createCustomDeployJobs = (
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  const yarnInstall = getYarnInstall(context.build, {
+  const yarnInstall = getYarnInstall(context, {
     noCustomPostInstall: true,
   });
   return createDeployementJobs(context, {

package/src/types/context.ts

@@ -87,7 +87,7 @@ export type ContextBeforeConfig = {
 
 export type BuildContextComponent = {
   dir: string;
-  packageManagerInfo: PackageManagerInfoComponent;
+
   config: BuildConfig;
 };
 
@@ -112,17 +112,12 @@ export type ComponentContext = {
 
   trigger?: PipelineTrigger;
   pipelineType?: PipelineType;
-  /**
-   * @deprecated use buildContext.packageManagerInfo instead
-   */
+
   packageManagerInfo: PackageManagerInfoComponent;
 
   customJobs?: CatladderJob[];
 };
 
-/**
- * @deprecated use ComponentContext instead
- */
 export type Context = ComponentContext;
 
 export type CatladderJobWithContext<S = BaseStage> = CatladderJob<S> & {