@catladder/pipeline 1.120.0 → 1.121.0

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

@@ -34,9 +34,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn lint",
         ],
         "stage": "test",
@@ -96,12 +100,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > api/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -241,9 +251,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn test",
         ],
         "stage": "test",
@@ -307,9 +321,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn lint",
         ],
         "stage": "test",
@@ -369,12 +387,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > www/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -518,9 +542,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn test",
         ],
         "stage": "test",
@@ -656,9 +684,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn lint",
         ],
         "stage": "test",
@@ -718,12 +750,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > api/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -863,9 +901,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn test",
         ],
         "stage": "test",
@@ -929,9 +971,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn lint",
         ],
         "stage": "test",
@@ -991,12 +1037,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > www/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -1140,9 +1192,13 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn test",
         ],
         "stage": "test",
@@ -1297,12 +1353,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > api/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -1370,12 +1432,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > api/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd api",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -1597,12 +1665,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > www/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",
@@ -1670,12 +1744,18 @@ exports[`matches snapshot 1`] = `
         },
         "script": [
           "echo '{"id":"some-id","time":"01-01-2023 12:13:14"}' > www/__build_info.json",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "cd www",
+          "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
+          "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
           "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
           "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+          "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
           "yarn install --immutable",
+          "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
           "yarn build",
         ],
         "stage": "build",

package/package.json

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

package/src/build/node/yarn.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../../types";
 import { ensureArray } from "../../utils";
+import { collapseableSection } from "../../utils/gitlab";
 
 const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 
@@ -14,10 +15,14 @@ const getYarnInstallCommand = (context: Context) => {
   return `yarn install --immutable`;
 };
 
-export const ensureNodeVersion = (context: Context) => [
-  "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
-  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
-];
+export const ensureNodeVersion = (context: Context) =>
+  collapseableSection(
+    "node install",
+    "Ensure node version"
+  )([
+    "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
+    "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+  ]);
 
 export const getYarnInstall = (
   context: Context,
@@ -29,13 +34,16 @@ export const getYarnInstall = (
     "postInstall" in context.componentConfig.build
       ? context.componentConfig.build.postInstall
       : null;
-  return [
+  return collapseableSection(
+    "yarn prepare",
+    "Node and yarn install"
+  )([
     ...ensureNodeVersion(context),
     getYarnInstallCommand(context),
     ...(postInstall && !options?.noCustomPostInstall
       ? ensureArray(postInstall) ?? []
       : []),
-  ];
+  ]);
 };
 
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;