@catladder/cli 1.153.1 → 1.154.1
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.
- package/dist/bundles/catenv/index.js +3 -3
- package/dist/bundles/cli/index.js +6 -6
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.js +1 -25
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/cli/src/gcloud/serviceAccounts.js +3 -3
- package/dist/cli/src/gcloud/serviceAccounts.js.map +1 -1
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.d.ts +3 -0
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js +81 -0
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js.map +1 -0
- package/dist/pipeline/src/build/base/createAppBuildJob.d.ts +3 -3
- package/dist/pipeline/src/build/base/createAppBuildJob.js +14 -13
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/index.d.ts +6 -2
- package/dist/pipeline/src/build/base/index.js +23 -5
- package/dist/pipeline/src/build/base/index.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +3 -2
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.js +2 -12
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +6 -6
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/index.d.ts +14 -5
- package/dist/pipeline/src/build/index.js +23 -3
- package/dist/pipeline/src/build/index.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.d.ts +7 -2
- package/dist/pipeline/src/build/node/buildJob.js +44 -42
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +2 -2
- package/dist/pipeline/src/build/node/cache.js +17 -9
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/index.d.ts +2 -2
- package/dist/pipeline/src/build/node/index.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +2 -8
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.d.ts +3 -2
- package/dist/pipeline/src/build/node/testJob.js +10 -3
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.js +1 -1
- package/dist/pipeline/src/build/node/yarn.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.d.ts +1 -1
- package/dist/pipeline/src/build/rails/build.js +7 -2
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.d.ts +1 -1
- package/dist/pipeline/src/build/rails/test.js +5 -0
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.js +7 -2
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +49 -5
- package/dist/pipeline/src/build/types.js +9 -1
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/createAllComponentsContext.d.ts +8 -0
- package/dist/pipeline/src/context/createAllComponentsContext.js +68 -0
- package/dist/pipeline/src/context/createAllComponentsContext.js.map +1 -0
- package/dist/pipeline/src/context/createComponentContext.d.ts +0 -4
- package/dist/pipeline/src/context/createComponentContext.js +81 -19
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/createWorkspaceContext.d.ts +9 -0
- package/dist/pipeline/src/context/createWorkspaceContext.js +86 -0
- package/dist/pipeline/src/context/createWorkspaceContext.js.map +1 -0
- package/dist/pipeline/src/context/getBuildInfoVariables.d.ts +1 -1
- package/dist/pipeline/src/context/getBuildInfoVariables.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentContext.d.ts +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.js +10 -4
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.js +2 -2
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.d.ts +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +29 -6
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts +4 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/index.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/custom/index.js.map +1 -1
- package/dist/pipeline/src/deploy/dockerTag/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/dockerTag/index.js.map +1 -1
- package/dist/pipeline/src/deploy/index.d.ts +7 -7
- package/dist/pipeline/src/deploy/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/additionalSecretKeys.d.ts +3 -1
- package/dist/pipeline/src/deploy/kubernetes/additionalSecretKeys.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/index.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.d.ts +1 -1
- package/dist/pipeline/src/deploy/sbom.js +6 -3
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/pipeline/createAllJobs.d.ts +12 -10
- package/dist/pipeline/src/pipeline/createAllJobs.js +84 -44
- package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/createChildPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +3 -4
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.d.ts +3 -0
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.js +10 -0
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.js.map +1 -0
- package/dist/pipeline/src/pipeline/createMainPipeline.js +18 -8
- package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts +3 -3
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +158 -51
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/packageManager.d.ts +2 -1
- package/dist/pipeline/src/pipeline/packageManager.js +36 -15
- package/dist/pipeline/src/pipeline/packageManager.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +2 -1
- package/dist/pipeline/src/types/context.d.ts +77 -12
- package/dist/pipeline/src/types/context.js +9 -0
- package/dist/pipeline/src/types/context.js.map +1 -1
- package/dist/pipeline/src/types/environmentContext.d.ts +5 -6
- package/dist/pipeline/src/types/jobs.d.ts +5 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +2 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +2 -10
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +1 -1
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -4
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +2 -2
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +1 -11
- package/src/gcloud/serviceAccounts.ts +3 -3
|
@@ -76,9 +76,9 @@ var getDockerImageVariables = function (context) {
|
|
|
76
76
|
: // gitlab registry:
|
|
77
77
|
{
|
|
78
78
|
DOCKER_REGISTRY: "$CI_REGISTRY",
|
|
79
|
-
DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.
|
|
79
|
+
DOCKER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE/caches/" + context.name,
|
|
80
80
|
// ONLY USED IN KUBERNETES
|
|
81
|
-
DOCKER_IMAGE_NAME: context.env + "/" + context.
|
|
81
|
+
DOCKER_IMAGE_NAME: context.env + "/" + context.name,
|
|
82
82
|
DOCKER_IMAGE: "$CI_REGISTRY_IMAGE/$DOCKER_IMAGE_NAME",
|
|
83
83
|
})), { DOCKER_IMAGE_TAG: "$CI_COMMIT_SHA" });
|
|
84
84
|
};
|
|
@@ -159,10 +159,10 @@ var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
|
|
|
159
159
|
};
|
|
160
160
|
var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
|
|
161
161
|
var _a;
|
|
162
|
-
var type = "docker" in context.
|
|
163
|
-
context.
|
|
164
|
-
"type" in context.
|
|
165
|
-
? (_a = context.
|
|
162
|
+
var type = "docker" in context.build.config &&
|
|
163
|
+
context.build.config.docker &&
|
|
164
|
+
"type" in context.build.config.docker
|
|
165
|
+
? (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.type
|
|
166
166
|
: defaultType;
|
|
167
167
|
return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
|
|
168
168
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAgC;AAChC,iCAA+B;AAC/B,8CAAwB;AAExB,oCAA2C;AAC3C,0EAI8C;AAC9C,gHAA+G;AAC/G,oCAA2C;AAG3C,0CAAsD;AAEtD,IAAM,4BAA4B,GAAG;IACnC,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,uBAAuB,GAAG,UAAC,OAAyB;;IAC/D,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,6BACK,CAAC,IAAA,uBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC;QACjD,CAAC,CAAC;YACE,eAAe,EAAE,IAAA,4CAAwB,EAAC,OAAO,CAAC;YAClD,YAAY,EAAE,IAAA,iDAA6B,EAAC,OAAO,CAAC;YACpD,kBAAkB,EAAE,IAAA,uDAAmC,EAAC,OAAO,CAAC;SACjE;QACH,CAAC,CAAC,mBAAmB;YACnB;gBACE,eAAe,EAAE,cAAc;gBAE/B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,24 @@
|
|
|
1
|
-
import type { ComponentContext } from "../types/context";
|
|
1
|
+
import type { ComponentContext, WorkspaceContext } from "../types/context";
|
|
2
2
|
import type { EnvironmentContext } from "../types/environmentContext";
|
|
3
3
|
import type { CatladderJob } from "../types/jobs";
|
|
4
|
-
import type { BuildConfig,
|
|
5
|
-
export * from "./types";
|
|
4
|
+
import type { BuildConfig, BuildConfigStandaloneType, WorkspaceBuildConfig } from "./types";
|
|
6
5
|
export * from "./node";
|
|
6
|
+
export * from "./types";
|
|
7
7
|
export type BuildTypes = {
|
|
8
|
-
[type in
|
|
8
|
+
[type in BuildConfigStandaloneType]: {
|
|
9
9
|
jobs: (context: ComponentContext) => CatladderJob[];
|
|
10
|
-
defaults: (envContext: EnvironmentContext
|
|
10
|
+
defaults: (envContext: EnvironmentContext) => Partial<Extract<BuildConfig, {
|
|
11
11
|
type: type;
|
|
12
12
|
}>>;
|
|
13
13
|
};
|
|
14
14
|
};
|
|
15
15
|
export declare const BUILD_TYPES: BuildTypes;
|
|
16
|
+
export type WorkspaceBuildTypes = {
|
|
17
|
+
[type in WorkspaceBuildConfig["type"]]: {
|
|
18
|
+
jobs: (context: WorkspaceContext) => CatladderJob[];
|
|
19
|
+
defaults: () => Partial<Extract<WorkspaceBuildConfig, {
|
|
20
|
+
type: type;
|
|
21
|
+
}>>;
|
|
22
|
+
};
|
|
23
|
+
};
|
|
24
|
+
export declare const WORKSPACE_BUILD_TYPES: WorkspaceBuildTypes;
|
|
@@ -14,41 +14,47 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.BUILD_TYPES = void 0;
|
|
17
|
+
exports.WORKSPACE_BUILD_TYPES = exports.BUILD_TYPES = void 0;
|
|
18
18
|
var custom_1 = require("./custom");
|
|
19
19
|
var node_1 = require("./node");
|
|
20
20
|
var rails_1 = require("./rails");
|
|
21
|
-
__exportStar(require("./types"), exports);
|
|
22
21
|
__exportStar(require("./node"), exports);
|
|
22
|
+
__exportStar(require("./types"), exports);
|
|
23
23
|
exports.BUILD_TYPES = {
|
|
24
24
|
node: {
|
|
25
25
|
jobs: node_1.createNodeJobs,
|
|
26
26
|
defaults: function () { return ({
|
|
27
27
|
buildCommand: "yarn build",
|
|
28
28
|
startCommand: "yarn start",
|
|
29
|
+
artifactsPaths: ["dist", ".next"],
|
|
29
30
|
}); },
|
|
30
31
|
},
|
|
31
32
|
"node-static": {
|
|
32
33
|
jobs: node_1.createNodeJobs,
|
|
33
34
|
defaults: function () { return ({
|
|
34
35
|
buildCommand: "yarn build",
|
|
36
|
+
artifactsPaths: ["dist"],
|
|
35
37
|
}); },
|
|
36
38
|
},
|
|
37
39
|
storybook: {
|
|
38
40
|
jobs: node_1.createStorybookJobs,
|
|
39
41
|
defaults: function () { return ({
|
|
40
42
|
buildCommand: ["yarn build-storybook --quiet -o ./dist"],
|
|
43
|
+
artifactsPaths: ["dist"],
|
|
41
44
|
}); },
|
|
42
45
|
},
|
|
43
46
|
meteor: {
|
|
44
47
|
jobs: node_1.createMeteorJobs,
|
|
45
48
|
defaults: function () { return ({
|
|
46
49
|
startCommand: "node main.js",
|
|
50
|
+
artifactsPaths: ["dist"],
|
|
47
51
|
}); },
|
|
48
52
|
},
|
|
49
53
|
custom: {
|
|
50
54
|
jobs: custom_1.createCustomJobs,
|
|
51
|
-
defaults: function () { return ({
|
|
55
|
+
defaults: function () { return ({
|
|
56
|
+
artifactsPaths: ["dist"],
|
|
57
|
+
}); },
|
|
52
58
|
},
|
|
53
59
|
rails: {
|
|
54
60
|
jobs: rails_1.createRailsJobs,
|
|
@@ -61,4 +67,18 @@ exports.BUILD_TYPES = {
|
|
|
61
67
|
}); },
|
|
62
68
|
},
|
|
63
69
|
};
|
|
70
|
+
exports.WORKSPACE_BUILD_TYPES = {
|
|
71
|
+
node: {
|
|
72
|
+
jobs: node_1.createNodeJobs,
|
|
73
|
+
defaults: function () { return ({
|
|
74
|
+
buildCommand: "yarn build",
|
|
75
|
+
lint: {
|
|
76
|
+
command: "yarn lint",
|
|
77
|
+
},
|
|
78
|
+
test: {
|
|
79
|
+
command: "yarn test",
|
|
80
|
+
},
|
|
81
|
+
}); },
|
|
82
|
+
},
|
|
83
|
+
};
|
|
64
84
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,mCAA4C;AAC5C,+BAA+E;AAC/E,iCAA0C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,mCAA4C;AAC5C,+BAA+E;AAC/E,iCAA0C;AAO1C,yCAAuB;AACvB,0CAAwB;AAWX,QAAA,WAAW,GAAe;IACrC,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAClC,CAAC,EAJc,CAId;KACH;IACD,aAAa,EAAE;QACb,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,EAHc,CAGd;KACH;IACD,SAAS,EAAE;QACT,IAAI,EAAE,0BAAmB;QACzB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,CAAC,wCAAwC,CAAC;YACxD,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,EAHc,CAGd;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,uBAAgB;QACtB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,cAAc;YAC5B,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,EAHc,CAGd;KACH;IACD,MAAM,EAAE;QACN,IAAI,EAAE,yBAAgB;QACtB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,cAAc,EAAE,CAAC,MAAM,CAAC;SACzB,CAAC,EAFc,CAEd;KACH;IACD,KAAK,EAAE;QACL,IAAI,EAAE,uBAAe;QACrB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,kBAAkB;YAChC,UAAU,EAAE;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,WAAW,EAAE,QAAQ;aACtB;SACF,CAAC,EANc,CAMd;KACH;CACF,CAAC;AASW,QAAA,qBAAqB,GAAwB;IACxD,IAAI,EAAE;QACJ,IAAI,EAAE,qBAAc;QACpB,QAAQ,EAAE,cAAM,OAAA,CAAC;YACf,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,WAAW;aACrB;SACF,CAAC,EARc,CAQd;KACH;CACF,CAAC"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { BuildContextStandalone, WorkspaceContext } from "../../types/context";
|
|
2
|
+
import { type ComponentContext } from "../../types/context";
|
|
2
3
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
|
|
4
|
+
import type { AppBuildJobDefinition } from "../base/createAppBuildJob";
|
|
5
|
+
import type { DockerBuildJobDefinition } from "../docker";
|
|
6
|
+
export declare const createNodeBuildJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
|
|
7
|
+
export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
|
|
8
|
+
export declare const createNodeDockerJobDefinition: (context: ComponentContext) => DockerBuildJobDefinition;
|
|
@@ -25,9 +25,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
25
25
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
26
26
|
};
|
|
27
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
|
-
exports.createNodeBuildJobs = void 0;
|
|
29
|
-
var path_1 = require("path");
|
|
28
|
+
exports.createNodeDockerJobDefinition = exports.createNodeBuildJobDefinition = exports.createNodeBuildJobs = void 0;
|
|
30
29
|
var runner_1 = require("../../runner");
|
|
30
|
+
var context_1 = require("../../types/context");
|
|
31
31
|
var utils_1 = require("../../utils");
|
|
32
32
|
var base_1 = require("../base");
|
|
33
33
|
var docker_1 = require("../docker");
|
|
@@ -36,52 +36,54 @@ var cache_1 = require("./cache");
|
|
|
36
36
|
var constants_1 = require("./constants");
|
|
37
37
|
var yarn_1 = require("./yarn");
|
|
38
38
|
var createNodeBuildJobs = function (context) {
|
|
39
|
-
|
|
39
|
+
if (context.type === "workspace") {
|
|
40
|
+
return (0, base_1.createWorkspaceBuildJobs)(context, {
|
|
41
|
+
appBuild: (0, exports.createNodeBuildJobDefinition)(context),
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
return (0, base_1.createComponentBuildJobs)(context, {
|
|
45
|
+
appBuild: (0, context_1.componentContextIsStandaloneBuild)(context)
|
|
46
|
+
? (0, exports.createNodeBuildJobDefinition)(context)
|
|
47
|
+
: undefined,
|
|
48
|
+
dockerBuild: (0, exports.createNodeDockerJobDefinition)(context),
|
|
49
|
+
});
|
|
50
|
+
};
|
|
51
|
+
exports.createNodeBuildJobs = createNodeBuildJobs;
|
|
52
|
+
var createNodeBuildJobDefinition = function (context) {
|
|
53
|
+
var _a, _b, _c;
|
|
40
54
|
var buildConfig = context.build.config;
|
|
41
55
|
if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
|
|
42
56
|
throw new Error("deploy config is not node, node-static or storybook");
|
|
43
57
|
}
|
|
58
|
+
if (buildConfig.buildCommand === null)
|
|
59
|
+
return undefined;
|
|
44
60
|
var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
|
|
45
61
|
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
46
|
-
return
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
jobTags: buildConfig.jobTags,
|
|
70
|
-
}
|
|
71
|
-
: undefined,
|
|
72
|
-
dockerBuild: {
|
|
73
|
-
script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
|
|
74
|
-
? "nginx"
|
|
75
|
-
: "node"),
|
|
76
|
-
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
|
|
77
|
-
variables: {
|
|
78
|
-
// only required for non static
|
|
79
|
-
DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
|
|
80
|
-
DOCKER_COPY_WORKSPACE_FILES: (_e = context.packageManagerInfo.pathsToCopyInDocker
|
|
81
|
-
.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _e === void 0 ? void 0 : _e.join("\n"),
|
|
82
|
-
},
|
|
62
|
+
return {
|
|
63
|
+
image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
|
|
64
|
+
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
65
|
+
cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
|
|
66
|
+
script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
|
|
67
|
+
jobTags: buildConfig.jobTags,
|
|
68
|
+
};
|
|
69
|
+
};
|
|
70
|
+
exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
|
|
71
|
+
var createNodeDockerJobDefinition = function (context) {
|
|
72
|
+
var _a, _b;
|
|
73
|
+
// get the default docker built-in type based on the build type
|
|
74
|
+
var dockerDefaultBuiltIn = context.build.buildType === "node-static" ||
|
|
75
|
+
context.build.buildType === "storybook"
|
|
76
|
+
? "nginx"
|
|
77
|
+
: "node";
|
|
78
|
+
return {
|
|
79
|
+
script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, dockerDefaultBuiltIn),
|
|
80
|
+
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
|
|
81
|
+
variables: {
|
|
82
|
+
// only required for non static
|
|
83
|
+
DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
|
|
84
|
+
DOCKER_COPY_WORKSPACE_FILES: (_b = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.pathsToCopyInDocker.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _b === void 0 ? void 0 : _b.join("\n"),
|
|
83
85
|
},
|
|
84
|
-
}
|
|
86
|
+
};
|
|
85
87
|
};
|
|
86
|
-
exports.
|
|
88
|
+
exports.createNodeDockerJobDefinition = createNodeDockerJobDefinition;
|
|
87
89
|
//# sourceMappingURL=buildJob.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA8C;AAK9C,+CAG6B;AAE7B,qCAA0C;AAC1C,gCAA6E;AAG7E,oCAAsE;AAEtE,kCAAyC;AACzC,iCAAmE;AACnE,yCAA0D;AAC1D,+BAAwE;AAEjE,IAAM,mBAAmB,GAAG,UACjC,OAA4C;IAE5C,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAA,oCAA4B,EAAC,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAA,oCAA4B,EAAC,OAAO,CAAC;YACvC,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC;KACpD,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,OAAoE;;IAEpE,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,IAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IACpD,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,uDACA,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC,kBACzC,IAAA,oBAAY,EAAC,OAAO,CAAC,kBACrB,IAAA,oBAAY,EAAC,OAAO,CAAC,SACzB;QACD,MAAM,yCAAM,WAAW,kBAAK,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;QAC1E,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,4BAA4B,gCAyBvC;AAEK,IAAM,6BAA6B,GAAG,UAC3C,OAAyB;;IAEzB,+DAA+D;IAC/D,IAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,2BAAM,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,SAAC;QACzC,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;YACpE,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,mBAAmB,CAC5C,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,iCAA0B,GAAG,mBAAS,GAAG,CAAE,EAA3C,CAA2C,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Context } from "../../types/context";
|
|
2
2
|
import type { GitlabJobCache } from "../../types/gitlab-types";
|
|
3
3
|
export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
4
4
|
export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
5
5
|
export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
6
|
-
export declare const getNextCache: (context:
|
|
6
|
+
export declare const getNextCache: (context: Context) => GitlabJobCache[];
|
|
@@ -34,7 +34,8 @@ var path_1 = require("path");
|
|
|
34
34
|
var slugify_1 = __importDefault(require("slugify"));
|
|
35
35
|
var getYarnCache = function (context, policy) {
|
|
36
36
|
if (policy === void 0) { policy = "pull-push"; }
|
|
37
|
-
var componentIsInWorkspace = context.
|
|
37
|
+
var componentIsInWorkspace = context.type === "component" &&
|
|
38
|
+
context.packageManagerInfo.componentIsInWorkspace;
|
|
38
39
|
return [
|
|
39
40
|
componentIsInWorkspace
|
|
40
41
|
? {
|
|
@@ -53,7 +54,8 @@ exports.getYarnCache = getYarnCache;
|
|
|
53
54
|
var getNodeModulesCache = function (context, policy) {
|
|
54
55
|
var _a;
|
|
55
56
|
if (policy === void 0) { policy = "pull-push"; }
|
|
56
|
-
var componentIsInWorkspace = context.
|
|
57
|
+
var componentIsInWorkspace = context.type === "component" &&
|
|
58
|
+
context.packageManagerInfo.componentIsInWorkspace;
|
|
57
59
|
// 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.
|
|
58
60
|
// It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
|
|
59
61
|
return [
|
|
@@ -79,12 +81,18 @@ var getNodeCache = function (context, policy) {
|
|
|
79
81
|
return __spreadArray(__spreadArray([], __read((0, exports.getYarnCache)(context, policy)), false), __read((0, exports.getNodeModulesCache)(context, policy)), false);
|
|
80
82
|
};
|
|
81
83
|
exports.getNodeCache = getNodeCache;
|
|
82
|
-
var getNextCache = function (context) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
84
|
+
var getNextCache = function (context) {
|
|
85
|
+
var key = context.name + "-next-cache";
|
|
86
|
+
var paths = context.build
|
|
87
|
+
.getComponentDirs("direct")
|
|
88
|
+
.map(function (c) { return (0, path_1.join)(c, ".next/cache"); });
|
|
89
|
+
return [
|
|
90
|
+
{
|
|
91
|
+
key: key,
|
|
92
|
+
policy: "pull-push",
|
|
93
|
+
paths: paths,
|
|
94
|
+
},
|
|
95
|
+
];
|
|
96
|
+
};
|
|
89
97
|
exports.getNextCache = getNextCache;
|
|
90
98
|
//# sourceMappingURL=cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8B;AAC9B,6BAA4B;AAC5B,oDAA8B;AAIvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO;gBACzC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;KACN,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8B;AAC9B,6BAA4B;AAC5B,oDAA8B;AAIvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO;gBACzC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;KACN,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAgB,EAChB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IAEpD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YACjP,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC9C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SAC/C;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,mBAAmB,uBA6B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC;IACzC,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK;SACxB,gBAAgB,CAAC,QAAQ,CAAC;SAC1B,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,WAAI,EAAC,CAAC,EAAE,aAAa,CAAC,EAAtB,CAAsB,CAAC,CAAC;IAEtC,OAAO;QACL;YACE,GAAG,KAAA;YACH,MAAM,EAAE,WAAW;YACnB,KAAK,OAAA;SACN;KACF,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { ComponentContext } from "../../types/context";
|
|
1
|
+
import type { ComponentContext, WorkspaceContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createNodeJobs: (context: ComponentContext) => CatladderJob[];
|
|
3
|
+
export declare const createNodeJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
|
|
4
4
|
export declare const createStorybookJobs: (context: ComponentContext) => CatladderJob[];
|
|
5
5
|
export declare const createMeteorJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAAiD;AACjD,mCAAiD;AACjD,qCAA+C;AAExC,IAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAAiD;AACjD,mCAAiD;AACjD,qCAA+C;AAExC,IAAM,cAAc,GAAG,UAC5B,OAA4C;IAE5C,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3E,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAyB;IAEzB,gCAAW,IAAA,8BAAmB,EAAC,OAAO,CAAC,UAAE;AAC3C,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B;AAEK,IAAM,gBAAgB,GAAG,UAAC,OAAyB;IACxD,8CAAW,IAAA,4BAAkB,EAAC,OAAO,CAAC,kBAAK,IAAA,8BAAqB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
|
|
@@ -35,7 +35,7 @@ var cache_1 = require("./cache");
|
|
|
35
35
|
var yarn_1 = require("./yarn");
|
|
36
36
|
var getMeteorCache = function (context) { return [
|
|
37
37
|
{
|
|
38
|
-
key: context.
|
|
38
|
+
key: context.name + "meteor-build-cache",
|
|
39
39
|
policy: "pull-push",
|
|
40
40
|
paths: [
|
|
41
41
|
(0, path_1.join)(context.build.dir, ".meteor/local/resolver-result-cache.json"),
|
|
@@ -51,7 +51,7 @@ var createMeteorBuildJobs = function (context) {
|
|
|
51
51
|
throw new Error("deploy config is not meteor");
|
|
52
52
|
}
|
|
53
53
|
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
54
|
-
return (0, base_1.
|
|
54
|
+
return (0, base_1.createComponentBuildJobs)(context, {
|
|
55
55
|
appBuild: buildConfig.buildCommand !== null
|
|
56
56
|
? {
|
|
57
57
|
cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
|
|
@@ -66,12 +66,6 @@ var createMeteorBuildJobs = function (context) {
|
|
|
66
66
|
'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory',
|
|
67
67
|
"cp ./__build_info.json ./dist/bundle/programs/server",
|
|
68
68
|
], false),
|
|
69
|
-
artifacts: {
|
|
70
|
-
paths: [
|
|
71
|
-
context.build.dir + "/__build_info.json",
|
|
72
|
-
context.build.dir + "/dist",
|
|
73
|
-
],
|
|
74
|
-
},
|
|
75
69
|
}
|
|
76
70
|
: undefined,
|
|
77
71
|
dockerBuild: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,
|
|
1
|
+
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAAmD;AACnD,oCAAsE;AACtE,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,IAAI,GAAG,oBAAoB;QACxC,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBAC7D,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAxCW,QAAA,qBAAqB,yBAwChC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WorkspaceContext } from "../../types/context";
|
|
2
|
+
import { type ComponentContext } from "../../types/context";
|
|
2
3
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createNodeTestJobs: (context: ComponentContext) => CatladderJob[];
|
|
4
|
+
export declare const createNodeTestJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
|
|
@@ -38,11 +38,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.createNodeTestJobs = void 0;
|
|
40
40
|
var runner_1 = require("../../runner");
|
|
41
|
+
var context_1 = require("../../types/context");
|
|
41
42
|
var utils_1 = require("../../utils");
|
|
43
|
+
var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
|
|
42
44
|
var cache_1 = require("./cache");
|
|
43
45
|
var constants_1 = require("./constants");
|
|
44
46
|
var yarn_1 = require("./yarn");
|
|
45
|
-
var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
|
|
46
47
|
var createNodeTestJobs = function (context) {
|
|
47
48
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
|
|
48
49
|
// don't run tests after release
|
|
@@ -50,15 +51,21 @@ var createNodeTestJobs = function (context) {
|
|
|
50
51
|
if (context.trigger === "taggedRelease") {
|
|
51
52
|
return [];
|
|
52
53
|
}
|
|
53
|
-
|
|
54
|
+
// if its not a standalone build, we don't need to run tests
|
|
55
|
+
if (context.type === "component" &&
|
|
56
|
+
!(0, context_1.componentContextIsStandaloneBuild)(context)) {
|
|
57
|
+
return [];
|
|
58
|
+
}
|
|
54
59
|
var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
|
|
55
60
|
var base = {
|
|
56
|
-
variables: __assign(
|
|
61
|
+
variables: __assign({ APP_PATH: context.build.dir }, (context.type === "component"
|
|
62
|
+
? __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), ((_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {})) : {})),
|
|
57
63
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
58
64
|
stage: "test",
|
|
59
65
|
needs: [],
|
|
60
66
|
envMode: "none",
|
|
61
67
|
};
|
|
68
|
+
var buildConfig = context.build.config;
|
|
62
69
|
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
63
70
|
var auditJob = buildConfig.audit !== false
|
|
64
71
|
? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage, cache: undefined, script: __spreadArray([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA8C;
|
|
1
|
+
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ var ensureNodeVersion = function (context) {
|
|
|
47
47
|
exports.ensureNodeVersion = ensureNodeVersion;
|
|
48
48
|
var getYarnInstall = function (context, options) {
|
|
49
49
|
var _a;
|
|
50
|
-
var postInstall = "postInstall" in context.build.config
|
|
50
|
+
var postInstall = context.type !== "workspace" && "postInstall" in context.build.config
|
|
51
51
|
? context.build.config.postInstall
|
|
52
52
|
: null;
|
|
53
53
|
return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read((postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAgB;IAC7C,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAgB;IAChD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAgB,EAChB,OAEC;;IAED,IAAM,WAAW,GACf,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAgB;IAC7C,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAgB;IAChD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAgB,EAChB,OAEC;;IAED,IAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,4DACK,IAAA,yBAAiB,EAAC,OAAO,CAAC,kBAC1B,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAChC,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;QAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,IAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,IAAM,8BAA8B,GAAG,UAAC,OAAgB;IAC7D,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB,gBACA,oBAAoB,6CACxB,iBAAiB,mBACb,oBAAoB,yBACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,IAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC;QACtD,OAAA,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAAhD,CAAgD,CACjD,CAAC;IACF,IAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB,YACF,iBAAiB,eACjB,6BAA6B,mBACzB,uBAAuB,aAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
|
|
@@ -37,6 +37,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.createRailsBuildJobs = void 0;
|
|
40
|
+
var __1 = require("../..");
|
|
40
41
|
var base_1 = require("../base");
|
|
41
42
|
var docker_1 = require("../docker");
|
|
42
43
|
var types_1 = require("../types");
|
|
@@ -47,8 +48,12 @@ var createRailsBuildJobs = function (context) {
|
|
|
47
48
|
// should not happen
|
|
48
49
|
throw new Error("build type is not rails");
|
|
49
50
|
}
|
|
51
|
+
// if its not a standalone build, we don't need to run tests
|
|
52
|
+
if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
|
|
53
|
+
throw new Error("workspace builds are not supported for rails apps");
|
|
54
|
+
}
|
|
50
55
|
if ((0, docker_1.hasDockerfile)(context)) {
|
|
51
|
-
return (0, base_1.
|
|
56
|
+
return (0, base_1.createComponentBuildJobs)(context, {
|
|
52
57
|
appBuild: undefined,
|
|
53
58
|
dockerBuild: {
|
|
54
59
|
script: (0, docker_1.getDockerBuildDefaultScript)(context),
|
|
@@ -63,7 +68,7 @@ var createRailsBuildJobs = function (context) {
|
|
|
63
68
|
return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
|
|
64
69
|
})
|
|
65
70
|
.join(" ");
|
|
66
|
-
return (0, base_1.
|
|
71
|
+
return (0, base_1.createComponentBuildJobs)(context, {
|
|
67
72
|
appBuild: undefined,
|
|
68
73
|
dockerBuild: {
|
|
69
74
|
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAKe;AAEf,gCAAmD;AACnD,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAClC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4DAA4D;IAC5D,IAAI,CAAC,IAAA,qCAAiC,EAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAAM,OAAA,iBAAU,CAAC,SAAG,CAAC,CAAC,CAAC,CAAC,WAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,MAAG;IAAjC,CAAiC,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAClC;YACD,gBAAgB;YAChB,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;gBACzB,yCAAyC;gBACzC,yFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,oBAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,yDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,oEACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,+DACmC,WAAW,cAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EAAE,CACvC;qBACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArDW,QAAA,oBAAoB,wBAqD/B"}
|
|
@@ -37,6 +37,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.createRailsTestJobs = void 0;
|
|
40
|
+
var __1 = require("../..");
|
|
40
41
|
var utils_1 = require("../../utils");
|
|
41
42
|
var createRailsTestJobs = function (context) {
|
|
42
43
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
@@ -45,6 +46,10 @@ var createRailsTestJobs = function (context) {
|
|
|
45
46
|
if (context.trigger === "taggedRelease") {
|
|
46
47
|
return [];
|
|
47
48
|
}
|
|
49
|
+
// if its not a standalone build, we don't need to run tests
|
|
50
|
+
if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
|
|
51
|
+
return [];
|
|
52
|
+
}
|
|
48
53
|
var buildConfig = context.build.config;
|
|
49
54
|
var base = {
|
|
50
55
|
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
|