@catladder/pipeline 1.100.2 → 1.101.0

package/dist/build/node/buildJob.js

@@ -53,7 +53,7 @@ var cache_1 = require("./cache");
 var constants_2 = require("./constants");
 var yarn_1 = require("./yarn");
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   var buildConfig = context.componentConfig.build;
   if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
     throw new Error("deploy config is not node, node-static or storybook");
@@ -61,13 +61,14 @@ var createNodeBuildJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
-    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    cache: __spreadArray(__spreadArray(__spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _a !== void 0 ? _a : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
+    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_d = (_c = buildConfig.artifactsPaths) === null || _c === void 0 ? void 0 : _c.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false)
-    }
+      })) !== null && _d !== void 0 ? _d : []), false)
+    },
+    jobTags: buildConfig.jobTags
   }) : null;
   return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
@@ -75,9 +76,9 @@ var createNodeBuildJobs = function (context) {
     variables: {
       // only required for non static
       DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
-      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_f = (_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+      })) === null || _f === void 0 ? void 0 : _f.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
   })] : []), false);

package/dist/build/node/yarn.js

@@ -44,7 +44,7 @@ var getYarnInstallCommand = function (context) {
   return "yarn install --immutable";
 };
 var ensureNodeVersion = function (context) {
-  return ["if [ -f ./.nvmrc ]; then source /root/.nvm/nvm.sh && nvm install <<< .nvmrc; fi"];
+  return ["if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi", "if [ -f ./.nvmrc ]; then nvm install <<< .nvmrc; fi"];
 };
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context) {

package/dist/build/types.d.ts

@@ -60,6 +60,14 @@ export declare type BuildConfigBase = {
    * use to display information in merge requests, pipeline views and security dashboards.
    */
   artifactsReports?: BuildConfigArtifactsReports;
+  /**
+   * customize cache for the job
+   */
+  jobCache?: CatladderJob["cache"];
+  /**
+   * tags for the underlying job runner (e.g gitlab)
+   */
+  jobTags?: string[];
 };
 export declare type BuildConfigNodeBase = BuildConfigBase;
 export declare type BuildConfigNode = {
@@ -93,10 +101,6 @@ export declare type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" |
   jobImage: string;
   jobServices?: GitlabJobService[];
   docker: BuildConfigCustomDocker;
-  /**
-   * customize cache for the job
-   */
-  jobCache?: CatladderJob["cache"];
   /**
    * custom lint, disabled when not set
    */