@catladder/pipeline 1.129.0 → 1.130.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (27) hide show
  1. package/dist/build/node/testJob.js +2 -2
  2. package/dist/build/node/yarn.js +1 -1
  3. package/dist/bundles/catladder-gitlab/index.js +1 -1
  4. package/dist/constants.js +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +32 -16
  7. package/examples/__snapshots__/cloud-run-meteor-with-worker.ts.snap +32 -16
  8. package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +32 -16
  9. package/examples/__snapshots__/cloud-run-non-public.ts.snap +32 -16
  10. package/examples/__snapshots__/cloud-run-post-stop-job.ts.snap +32 -16
  11. package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +64 -32
  12. package/examples/__snapshots__/cloud-run-with-sql.ts.snap +64 -32
  13. package/examples/__snapshots__/cloud-run-with-worker.ts.snap +32 -16
  14. package/examples/__snapshots__/custom-deploy.ts.snap +32 -16
  15. package/examples/__snapshots__/custom-envs.ts.snap +36 -20
  16. package/examples/__snapshots__/kubernetes-application-customization.ts.snap +32 -16
  17. package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +32 -16
  18. package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +32 -16
  19. package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +64 -32
  20. package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +32 -16
  21. package/examples/__snapshots__/meteor-kubernetes.ts.snap +32 -16
  22. package/examples/__snapshots__/native-app.ts.snap +64 -32
  23. package/examples/__snapshots__/node-build-with-custom-image.ts.snap +32 -16
  24. package/examples/__snapshots__/wait-for-other-deploy.ts.snap +64 -32
  25. package/package.json +1 -1
  26. package/src/build/node/testJob.ts +3 -1
  27. package/src/build/node/yarn.ts +10 -7
package/examples/__snapshots__/node-build-with-custom-image.ts.snap CHANGED
@@ -33,14 +33,18 @@ exports[`matches snapshot 1`] = `
33
33
  ],
34
34
  },
35
35
  "script": [
36
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
37
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
38
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
39
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
36
40
  "cd www",
37
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
38
41
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
39
42
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
40
43
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
41
44
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
45
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
42
46
  "yarn install --immutable",
43
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
47
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
44
48
  "yarn lint",
45
49
  ],
46
50
  "stage": "test",
@@ -105,13 +109,13 @@ exports[`matches snapshot 1`] = `
105
109
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
106
110
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
107
111
  "cd www",
108
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
109
112
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
110
113
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
111
114
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
112
115
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
116
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
113
117
  "yarn install --immutable",
114
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
118
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
115
119
  "yarn build",
116
120
  ],
117
121
  "stage": "build",
@@ -438,14 +442,18 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
438
442
  ],
439
443
  },
440
444
  "script": [
445
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
446
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
447
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
448
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
441
449
  "cd www",
442
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
443
450
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
444
451
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
445
452
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
446
453
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
454
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
447
455
  "yarn install --immutable",
448
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
456
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
449
457
  "yarn test",
450
458
  ],
451
459
  "stage": "test",
@@ -581,14 +589,18 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
581
589
  ],
582
590
  },
583
591
  "script": [
592
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
593
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
594
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
595
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
584
596
  "cd www",
585
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
586
597
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
587
598
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
588
599
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
589
600
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
601
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
590
602
  "yarn install --immutable",
591
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
603
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
592
604
  "yarn lint",
593
605
  ],
594
606
  "stage": "test",
@@ -653,13 +665,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
653
665
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
654
666
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
655
667
  "cd www",
656
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
657
668
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
658
669
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
659
670
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
660
671
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
672
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
661
673
  "yarn install --immutable",
662
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
674
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
663
675
  "yarn build",
664
676
  ],
665
677
  "stage": "build",
@@ -992,14 +1004,18 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
992
1004
  ],
993
1005
  },
994
1006
  "script": [
1007
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1008
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1009
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1010
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
995
1011
  "cd www",
996
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
997
1012
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
998
1013
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
999
1014
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1000
1015
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1016
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1001
1017
  "yarn install --immutable",
1002
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1018
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1003
1019
  "yarn test",
1004
1020
  ],
1005
1021
  "stage": "test",
@@ -1160,13 +1176,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1160
1176
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1161
1177
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1162
1178
  "cd www",
1163
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1164
1179
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1165
1180
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1166
1181
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1167
1182
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1183
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1168
1184
  "yarn install --immutable",
1169
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1185
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1170
1186
  "yarn build",
1171
1187
  ],
1172
1188
  "stage": "build",
@@ -1244,13 +1260,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
1244
1260
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1245
1261
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1246
1262
  "cd www",
1247
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1248
1263
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1249
1264
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1250
1265
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1251
1266
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1267
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1252
1268
  "yarn install --immutable",
1253
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1269
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1254
1270
  "yarn build",
1255
1271
  ],
1256
1272
  "stage": "build",
package/examples/__snapshots__/wait-for-other-deploy.ts.snap CHANGED
@@ -33,14 +33,18 @@ exports[`matches snapshot 1`] = `
33
33
  ],
34
34
  },
35
35
  "script": [
36
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
37
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
38
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
39
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
36
40
  "cd api",
37
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
38
41
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
39
42
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
40
43
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
41
44
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
45
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
42
46
  "yarn install --immutable",
43
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
47
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
44
48
  "yarn lint",
45
49
  ],
46
50
  "stage": "test",
@@ -105,13 +109,13 @@ exports[`matches snapshot 1`] = `
105
109
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
106
110
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
107
111
  "cd api",
108
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
109
112
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
110
113
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
111
114
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
112
115
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
116
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
113
117
  "yarn install --immutable",
114
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
118
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
115
119
  "yarn build",
116
120
  ],
117
121
  "stage": "build",
@@ -254,14 +258,18 @@ exports[`matches snapshot 1`] = `
254
258
  ],
255
259
  },
256
260
  "script": [
261
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
262
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
263
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
264
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
257
265
  "cd api",
258
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
259
266
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
260
267
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
261
268
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
262
269
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
270
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
263
271
  "yarn install --immutable",
264
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
272
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
265
273
  "yarn test",
266
274
  ],
267
275
  "stage": "test",
@@ -324,14 +332,18 @@ exports[`matches snapshot 1`] = `
324
332
  ],
325
333
  },
326
334
  "script": [
335
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
336
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
337
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
338
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
327
339
  "cd www",
328
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
329
340
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
330
341
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
331
342
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
332
343
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
344
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
333
345
  "yarn install --immutable",
334
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
346
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
335
347
  "yarn lint",
336
348
  ],
337
349
  "stage": "test",
@@ -396,13 +408,13 @@ exports[`matches snapshot 1`] = `
396
408
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
397
409
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
398
410
  "cd www",
399
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
400
411
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
401
412
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
402
413
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
403
414
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
415
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
404
416
  "yarn install --immutable",
405
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
417
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
406
418
  "yarn build",
407
419
  ],
408
420
  "stage": "build",
@@ -549,14 +561,18 @@ exports[`matches snapshot 1`] = `
549
561
  ],
550
562
  },
551
563
  "script": [
564
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
565
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
566
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
567
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
552
568
  "cd www",
553
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
554
569
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
555
570
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
556
571
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
557
572
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
573
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
558
574
  "yarn install --immutable",
559
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
575
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
560
576
  "yarn test",
561
577
  ],
562
578
  "stage": "test",
@@ -692,14 +708,18 @@ exports[`matches snapshot 1`] = `
692
708
  ],
693
709
  },
694
710
  "script": [
711
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
712
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
713
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
714
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
695
715
  "cd api",
696
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
697
716
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
698
717
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
699
718
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
700
719
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
720
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
701
721
  "yarn install --immutable",
702
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
722
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
703
723
  "yarn lint",
704
724
  ],
705
725
  "stage": "test",
@@ -764,13 +784,13 @@ exports[`matches snapshot 1`] = `
764
784
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
765
785
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
766
786
  "cd api",
767
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
768
787
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
769
788
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
770
789
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
771
790
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
791
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
772
792
  "yarn install --immutable",
773
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
793
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
774
794
  "yarn build",
775
795
  ],
776
796
  "stage": "build",
@@ -913,14 +933,18 @@ exports[`matches snapshot 1`] = `
913
933
  ],
914
934
  },
915
935
  "script": [
936
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
937
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
938
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
939
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
916
940
  "cd api",
917
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
918
941
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
919
942
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
920
943
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
921
944
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
945
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
922
946
  "yarn install --immutable",
923
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
947
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
924
948
  "yarn test",
925
949
  ],
926
950
  "stage": "test",
@@ -983,14 +1007,18 @@ exports[`matches snapshot 1`] = `
983
1007
  ],
984
1008
  },
985
1009
  "script": [
1010
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1011
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1012
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1013
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
986
1014
  "cd www",
987
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
988
1015
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
989
1016
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
990
1017
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
991
1018
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1019
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
992
1020
  "yarn install --immutable",
993
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1021
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
994
1022
  "yarn lint",
995
1023
  ],
996
1024
  "stage": "test",
@@ -1055,13 +1083,13 @@ exports[`matches snapshot 1`] = `
1055
1083
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1056
1084
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1057
1085
  "cd www",
1058
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1059
1086
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1060
1087
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1061
1088
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1062
1089
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1090
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1063
1091
  "yarn install --immutable",
1064
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1092
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1065
1093
  "yarn build",
1066
1094
  ],
1067
1095
  "stage": "build",
@@ -1208,14 +1236,18 @@ exports[`matches snapshot 1`] = `
1208
1236
  ],
1209
1237
  },
1210
1238
  "script": [
1239
+ "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1240
+ "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1241
+ "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1242
+ "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1211
1243
  "cd www",
1212
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1213
1244
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1214
1245
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1215
1246
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1216
1247
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1248
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1217
1249
  "yarn install --immutable",
1218
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1250
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1219
1251
  "yarn test",
1220
1252
  ],
1221
1253
  "stage": "test",
@@ -1376,13 +1408,13 @@ exports[`matches snapshot 1`] = `
1376
1408
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1377
1409
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1378
1410
  "cd api",
1379
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1380
1411
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1381
1412
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1382
1413
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1383
1414
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1415
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1384
1416
  "yarn install --immutable",
1385
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1417
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1386
1418
  "yarn build",
1387
1419
  ],
1388
1420
  "stage": "build",
@@ -1457,13 +1489,13 @@ exports[`matches snapshot 1`] = `
1457
1489
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1458
1490
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1459
1491
  "cd api",
1460
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1461
1492
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1462
1493
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1463
1494
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1464
1495
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1496
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1465
1497
  "yarn install --immutable",
1466
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1498
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1467
1499
  "yarn build",
1468
1500
  ],
1469
1501
  "stage": "build",
@@ -1696,13 +1728,13 @@ exports[`matches snapshot 1`] = `
1696
1728
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1697
1729
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1698
1730
  "cd www",
1699
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1700
1731
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1701
1732
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1702
1733
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1703
1734
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1735
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1704
1736
  "yarn install --immutable",
1705
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1737
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1706
1738
  "yarn build",
1707
1739
  ],
1708
1740
  "stage": "build",
@@ -1777,13 +1809,13 @@ exports[`matches snapshot 1`] = `
1777
1809
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1778
1810
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1779
1811
  "cd www",
1780
- "echo -e "\\e[0Ksection_start:$(date +%s):yarn prepare[collapsed=true]\\r\\e[0KNode and yarn install"",
1781
1812
  "echo -e "\\e[0Ksection_start:$(date +%s):node install[collapsed=true]\\r\\e[0KEnsure node version"",
1782
1813
  "if [ -f ~/.nvm/nvm.sh ]; then source ~/.nvm/nvm.sh; fi",
1783
1814
  "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
1784
1815
  "echo -e "\\e[0Ksection_end:$(date +%s):node install\\r\\e[0K"",
1816
+ "echo -e "\\e[0Ksection_start:$(date +%s):yarn install[collapsed=true]\\r\\e[0KYarn install"",
1785
1817
  "yarn install --immutable",
1786
- "echo -e "\\e[0Ksection_end:$(date +%s):yarn prepare\\r\\e[0K"",
1818
+ "echo -e "\\e[0Ksection_end:$(date +%s):yarn install\\r\\e[0K"",
1787
1819
  "yarn build",
1788
1820
  ],
1789
1821
  "stage": "build",
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "1.129.0",
55
+ "version": "1.130.0",
56
56
  "scripts": {
57
57
  "build:tsc": "yarn tsc",
58
58
  "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",
package/src/build/node/testJob.ts CHANGED
@@ -4,7 +4,7 @@ import type { CatladderJob } from "../../types/jobs";
4
4
  import { ensureArray, notNil } from "../../utils";
5
5
  import { getNodeCache } from "./cache";
6
6
  import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
7
- import { getYarnInstall } from "./yarn";
7
+ import { ensureNodeVersion, getYarnInstall } from "./yarn";
8
8
  import { createArtifactsConfig } from "../base/createArtifactsConfig";
9
9
 
10
10
  export const createNodeTestJobs = (context: Context): CatladderJob[] => {
@@ -59,6 +59,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
59
59
  image: buildConfig.lint?.jobImage ?? defaultImage,
60
60
  cache: getNodeCache(context),
61
61
  script: [
62
+ ...ensureNodeVersion(context),
62
63
  `cd ${context.componentConfig.dir}`,
63
64
  ...yarnInstall,
64
65
  ...(ensureArray(buildConfig.lint?.command) ?? ["yarn lint"]),
@@ -80,6 +81,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
80
81
  buildConfig.test?.jobImage ?? getRunnerImage("jobs-testing-chrome"),
81
82
  cache: getNodeCache(context),
82
83
  script: [
84
+ ...ensureNodeVersion(context),
83
85
  `cd ${context.componentConfig.dir}`,
84
86
  ...yarnInstall,
85
87
  ...(ensureArray(buildConfig.test?.command) ?? ["yarn test"]),
package/src/build/node/yarn.ts CHANGED
@@ -34,16 +34,19 @@ export const getYarnInstall = (
34
34
  "postInstall" in context.componentConfig.build
35
35
  ? context.componentConfig.build.postInstall
36
36
  : null;
37
- return collapseableSection(
38
- "yarn prepare",
39
- "Node and yarn install"
40
- )([
37
+ return [
41
38
  ...ensureNodeVersion(context),
42
- getYarnInstallCommand(context),
39
+ ...collapseableSection(
40
+ "yarn install",
41
+ "Yarn install"
42
+ )([getYarnInstallCommand(context)]),
43
43
  ...(postInstall && !options?.noCustomPostInstall
44
- ? ensureArray(postInstall) ?? []
44
+ ? collapseableSection(
45
+ "post install",
46
+ "Custom post install"
47
+ )(ensureArray(postInstall) ?? [])
45
48
  : []),
46
- ]);
49
+ ];
47
50
  };
48
51
 
49
52
  const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;