@catladder/pipeline 0.0.0-refactor-docker-9fda97e9 → 0.0.0-refactor-docker-c24f8608
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/build/base/createAppBuildJob.d.ts +2 -2
- package/dist/build/base/createAppBuildJob.js +1 -1
- package/dist/build/base/index.d.ts +2 -2
- package/dist/build/base/writeBuildInfo.d.ts +2 -2
- package/dist/build/base/writeDotEnv.d.ts +2 -2
- package/dist/build/custom/buildJob.d.ts +2 -2
- package/dist/build/custom/index.d.ts +2 -2
- package/dist/build/custom/testJob.d.ts +2 -2
- package/dist/build/docker.d.ts +11 -11
- package/dist/build/docker.js +6 -6
- package/dist/build/index.d.ts +2 -2
- package/dist/build/node/buildJob.d.ts +2 -2
- package/dist/build/node/buildJob.js +7 -7
- package/dist/build/node/cache.d.ts +5 -5
- package/dist/build/node/cache.js +4 -4
- package/dist/build/node/index.d.ts +4 -4
- package/dist/build/node/meteor.d.ts +2 -2
- package/dist/build/node/meteor.js +2 -2
- package/dist/build/node/testJob.d.ts +2 -2
- package/dist/build/node/testJob.js +6 -6
- package/dist/build/node/yarn.d.ts +4 -4
- package/dist/build/node/yarn.js +1 -1
- package/dist/build/rails/build.d.ts +2 -2
- package/dist/build/rails/index.d.ts +2 -2
- package/dist/build/rails/test.d.ts +2 -2
- package/dist/build/sbom.d.ts +2 -2
- package/dist/build/sbom.js +1 -1
- package/dist/bundles/catladder-gitlab/index.js +61 -46
- package/dist/constants.js +1 -1
- package/dist/context/getEnvironment.d.ts +2 -2
- package/dist/context/getEnvironmentContext.d.ts +2 -2
- package/dist/context/getEnvironmentVariables.d.ts +4 -4
- package/dist/context/getEnvironmentVariables.js +1 -2
- package/dist/context/getLabels.d.ts +2 -2
- package/dist/context/index.d.ts +7 -3
- package/dist/context/index.js +12 -3
- package/dist/deploy/base/deploy.d.ts +2 -2
- package/dist/deploy/base/index.d.ts +2 -2
- package/dist/deploy/base/rollback.d.ts +2 -2
- package/dist/deploy/base/stop.d.ts +2 -2
- package/dist/deploy/cloudRun/artifactsRegistry.d.ts +7 -7
- package/dist/deploy/cloudRun/cleanup.d.ts +2 -2
- package/dist/deploy/cloudRun/cloudRunRevisions.d.ts +2 -2
- package/dist/deploy/cloudRun/createJobs/cloudRunJobs.d.ts +6 -6
- package/dist/deploy/cloudRun/createJobs/cloudRunServices.d.ts +3 -3
- package/dist/deploy/cloudRun/createJobs/common.d.ts +4 -4
- package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.d.ts +2 -2
- package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +1 -2
- package/dist/deploy/cloudRun/createJobs/getCloudRunStopScripts.d.ts +2 -2
- package/dist/deploy/cloudRun/createJobs/index.d.ts +2 -2
- package/dist/deploy/cloudRun/utils/database.d.ts +3 -3
- package/dist/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.d.ts +2 -2
- package/dist/deploy/cloudRun/utils/getServiceName.d.ts +2 -2
- package/dist/deploy/custom/deployJob.d.ts +2 -2
- package/dist/deploy/custom/deployJob.js +1 -1
- package/dist/deploy/dockerTag/deployJob.d.ts +2 -2
- package/dist/deploy/index.d.ts +2 -2
- package/dist/deploy/kubernetes/cloudSql/index.d.ts +3 -3
- package/dist/deploy/kubernetes/deployJob.d.ts +2 -2
- package/dist/deploy/kubernetes/kubeEnv.d.ts +2 -2
- package/dist/deploy/kubernetes/kubeValues.d.ts +2 -2
- package/dist/deploy/kubernetes/kubeValues.js +1 -3
- package/dist/deploy/kubernetes/mongodb.d.ts +2 -2
- package/dist/deploy/sbom.d.ts +4 -4
- package/dist/deploy/utils.d.ts +2 -2
- package/dist/pipeline/createJobsForComponent.d.ts +2 -2
- package/dist/pipeline/createJobsForComponent.js +1 -1
- package/dist/pipeline/generatePipelineFiles.js +15 -5
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/config.d.ts +3 -3
- package/dist/types/context.d.ts +16 -2
- package/dist/types/jobs.d.ts +1 -1
- package/examples/__snapshots__/cloud-run-storybook.ts.snap +1687 -0
- package/examples/__utils__/helpers.ts +2 -2
- package/examples/cloud-run-storybook.ts +24 -0
- package/package.json +1 -1
- package/scripts/generate-gitlab-ci-types.ts +2 -2
- package/src/bash/BashExpression.ts +4 -4
- package/src/bash/bashExpressionPerPipelineType.ts +1 -1
- package/src/bash/replaceAsync.ts +4 -4
- package/src/build/base/__tests__/createArtifactsConfig.test.ts +3 -3
- package/src/build/base/createAppBuildJob.ts +3 -3
- package/src/build/base/createArtifactsConfig.ts +2 -2
- package/src/build/base/index.ts +2 -2
- package/src/build/base/writeBuildInfo.ts +2 -2
- package/src/build/base/writeDotEnv.ts +3 -3
- package/src/build/custom/__tests__/testJob.test.ts +6 -6
- package/src/build/custom/buildJob.ts +4 -2
- package/src/build/custom/index.ts +2 -2
- package/src/build/custom/testJob.ts +7 -5
- package/src/build/docker.ts +18 -18
- package/src/build/index.ts +3 -3
- package/src/build/node/buildJob.ts +16 -10
- package/src/build/node/cache.ts +13 -13
- package/src/build/node/index.ts +6 -4
- package/src/build/node/meteor.ts +10 -5
- package/src/build/node/testJob.ts +14 -11
- package/src/build/node/yarn.ts +13 -15
- package/src/build/rails/build.ts +4 -2
- package/src/build/rails/index.ts +2 -2
- package/src/build/rails/test.ts +4 -2
- package/src/build/sbom.ts +4 -4
- package/src/config/configruedEnvs.ts +6 -6
- package/src/config/readConfig.ts +2 -2
- package/src/context/__tests__/resolveReferences.test.ts +1 -1
- package/src/context/getBuildInfoVariables.ts +5 -5
- package/src/context/getEnvConfig.ts +1 -1
- package/src/context/getEnvType.ts +1 -1
- package/src/context/getEnvironment.ts +2 -2
- package/src/context/getEnvironmentContext.ts +4 -4
- package/src/context/getEnvironmentVariables.ts +19 -16
- package/src/context/getLabels.ts +2 -2
- package/src/context/getReviewSlug.ts +2 -2
- package/src/context/index.ts +17 -7
- package/src/context/resolveReferences.ts +12 -9
- package/src/context/transformJobOnlyVars.ts +1 -1
- package/src/context/utils/envVars.ts +3 -3
- package/src/deploy/base/deploy.ts +7 -7
- package/src/deploy/base/index.ts +3 -3
- package/src/deploy/base/rollback.ts +3 -3
- package/src/deploy/base/stop.ts +3 -3
- package/src/deploy/cloudRun/artifactsRegistry.ts +17 -12
- package/src/deploy/cloudRun/cleanup.ts +5 -5
- package/src/deploy/cloudRun/cloudRunRevisions.ts +6 -6
- package/src/deploy/cloudRun/createJobs/cloudRunJobs.ts +20 -20
- package/src/deploy/cloudRun/createJobs/cloudRunServices.ts +7 -7
- package/src/deploy/cloudRun/createJobs/common.ts +5 -5
- package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts +12 -9
- package/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts +3 -3
- package/src/deploy/cloudRun/createJobs/index.ts +2 -2
- package/src/deploy/cloudRun/createJobs/volumes.ts +2 -2
- package/src/deploy/cloudRun/index.ts +10 -6
- package/src/deploy/cloudRun/utils/createArgsString.ts +1 -1
- package/src/deploy/cloudRun/utils/database.ts +8 -8
- package/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts +5 -3
- package/src/deploy/cloudRun/utils/getServiceName.ts +2 -2
- package/src/deploy/cloudRun/utils/jobName.ts +1 -1
- package/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.ts +1 -1
- package/src/deploy/cloudSql/utils.ts +2 -2
- package/src/deploy/custom/deployJob.ts +7 -3
- package/src/deploy/dockerTag/deployJob.ts +4 -2
- package/src/deploy/index.ts +5 -5
- package/src/deploy/kubernetes/cloudSql/index.ts +5 -5
- package/src/deploy/kubernetes/deployJob.ts +7 -7
- package/src/deploy/kubernetes/index.ts +1 -1
- package/src/deploy/kubernetes/kubeEnv.ts +3 -3
- package/src/deploy/kubernetes/kubeValues.ts +8 -8
- package/src/deploy/kubernetes/mongodb.ts +9 -9
- package/src/deploy/kubernetes/processSecretsAsFiles.ts +3 -3
- package/src/deploy/sbom.ts +8 -4
- package/src/deploy/utils.ts +4 -4
- package/src/pipeline/createAllJobs.ts +4 -4
- package/src/pipeline/createChildPipeline.ts +2 -2
- package/src/pipeline/createJobsForComponent.ts +13 -9
- package/src/pipeline/createMainPipeline.ts +20 -17
- package/src/pipeline/generatePipelineFiles.ts +21 -12
- package/src/pipeline/getPipelineStages.ts +1 -1
- package/src/pipeline/gitlab/createGitlabJobs.ts +26 -26
- package/src/pipeline/gitlab/getPipelineTriggerForGitlabChildPipeline.ts +6 -6
- package/src/pipeline/packageManager.ts +2 -2
- package/src/pipeline/yarn/yarnUtils.ts +7 -7
- package/src/types/config.ts +4 -4
- package/src/types/context.ts +19 -3
- package/src/types/environmentContext.ts +1 -1
- package/src/types/jobs.ts +1 -1
- package/src/types/utils.ts +4 -4
- package/src/utils/gitlab.ts +1 -1
- package/src/utils/index.ts +2 -2
- package/src/utils/writeFiles.ts +2 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../../types";
|
|
2
2
|
import type { DeployConfigCloudRun, DeployConfigCloudRunCloudSql } from "../../types";
|
|
3
|
-
export declare const getDatabaseDeleteScript: (context:
|
|
4
|
-
export declare const getDatabaseCreateScript: (context:
|
|
3
|
+
export declare const getDatabaseDeleteScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
|
|
4
|
+
export declare const getDatabaseCreateScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
|
|
5
5
|
export declare const DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
|
|
6
6
|
export declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql) => string;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const gcloudServiceAccountLoginCommands: (context:
|
|
1
|
+
import type { ComponentContext } from "../../../types";
|
|
2
|
+
export declare const gcloudServiceAccountLoginCommands: (context: ComponentContext) => string[];
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const getServiceName: (context:
|
|
1
|
+
import type { ComponentContext } from "../../../types/context";
|
|
2
|
+
export declare const getServiceName: (context: ComponentContext) => string | import("../../../bash/BashExpression").BashExpression;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createCustomDeployJobs: (context:
|
|
3
|
+
export declare const createCustomDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -51,7 +51,7 @@ var createCustomDeployJobs = function (context) {
|
|
|
51
51
|
throw new Error("deploy config is not custom");
|
|
52
52
|
}
|
|
53
53
|
// FIXME: custom deploy currently assumes yarn-based project
|
|
54
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
|
|
54
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext, {
|
|
55
55
|
noCustomPostInstall: true
|
|
56
56
|
});
|
|
57
57
|
return (0, base_1.createDeployementJobs)(context, {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createDockerTagDeployJobs: (context:
|
|
3
|
+
export declare const createDockerTagDeployJobs: (context: ComponentContext) => CatladderJob[];
|
package/dist/deploy/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SecretEnvVar } from "..";
|
|
2
2
|
import type { BashExpression } from "../bash/BashExpression";
|
|
3
|
-
import type {
|
|
3
|
+
import type { ComponentContext } from "../types/context";
|
|
4
4
|
import type { EnvironmentContext } from "../types/environmentContext";
|
|
5
5
|
import type { CatladderJob } from "../types/jobs";
|
|
6
6
|
import type { PartialDeep } from "../types/utils";
|
|
@@ -10,7 +10,7 @@ export * from "./kubernetes";
|
|
|
10
10
|
export * from "./types";
|
|
11
11
|
export * from "./utils";
|
|
12
12
|
export type DeployTypeDefinition<T extends DeployConfigType> = {
|
|
13
|
-
jobs: (context:
|
|
13
|
+
jobs: (context: ComponentContext) => CatladderJob[];
|
|
14
14
|
defaults: (envContext: EnvironmentContext<any, T>) => PartialDeep<DeployConfigGeneric<T>>;
|
|
15
15
|
additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => SecretEnvVar[];
|
|
16
16
|
getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | BashExpression | undefined | null>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { StringOrBashExpression } from "../../../bash/BashExpression";
|
|
2
|
-
import type {
|
|
3
|
-
export declare const hasKubernetesCloudSQL: (context:
|
|
2
|
+
import type { ComponentContext } from "../../../types";
|
|
3
|
+
export declare const hasKubernetesCloudSQL: (context: ComponentContext) => boolean | undefined;
|
|
4
4
|
type CloudSqlValues = {
|
|
5
5
|
enabled: boolean;
|
|
6
6
|
proxyCredentials: string;
|
|
@@ -8,7 +8,7 @@ type CloudSqlValues = {
|
|
|
8
8
|
fullDbName: StringOrBashExpression;
|
|
9
9
|
dbUser: string;
|
|
10
10
|
};
|
|
11
|
-
export declare const createKubernetesCloudsqlBaseValues: (context:
|
|
11
|
+
export declare const createKubernetesCloudsqlBaseValues: (context: ComponentContext) => {
|
|
12
12
|
cloudsql: CloudSqlValues;
|
|
13
13
|
};
|
|
14
14
|
export {};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export declare const createKubernetesDeployJobs: (context:
|
|
3
|
+
export declare const createKubernetesDeployJobs: (context: ComponentContext) => CatladderJob[];
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { StringOrBashExpression } from "../../bash/BashExpression";
|
|
2
|
-
import type {
|
|
2
|
+
import type { ComponentContext } from "../../types";
|
|
3
3
|
/**
|
|
4
4
|
* separate by secrets and public.
|
|
5
5
|
* we evalulate the actual values later, but want to store the secrets in kubernetes secrets
|
|
6
6
|
*/
|
|
7
|
-
export declare const createKubeEnv: (context:
|
|
7
|
+
export declare const createKubeEnv: (context: ComponentContext) => {
|
|
8
8
|
secret: Record<string, StringOrBashExpression>;
|
|
9
9
|
public: Record<string, StringOrBashExpression>;
|
|
10
10
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const createKubeValues: (context:
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
|
+
export declare const createKubeValues: (context: ComponentContext) => never[] | ({
|
|
3
3
|
env: {
|
|
4
4
|
secret: Record<string, import("../../bash/BashExpression").StringOrBashExpression>;
|
|
5
5
|
public: Record<string, import("../../bash/BashExpression").StringOrBashExpression>;
|
|
@@ -81,10 +81,8 @@ var createAppConfig = function (context, application) {
|
|
|
81
81
|
}
|
|
82
82
|
},
|
|
83
83
|
// default
|
|
84
|
-
rest
|
|
85
|
-
);
|
|
84
|
+
rest);
|
|
86
85
|
};
|
|
87
|
-
|
|
88
86
|
var removeFalsy = function (record) {
|
|
89
87
|
if (!record) return undefined;
|
|
90
88
|
return Object.fromEntries(Object.entries(record).filter(function (_a) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const createMongodbBaseConfig: (context:
|
|
1
|
+
import type { ComponentContext } from "../../types/context";
|
|
2
|
+
export declare const createMongodbBaseConfig: (context: ComponentContext) => {
|
|
3
3
|
mongodb: {
|
|
4
4
|
enabled: boolean;
|
|
5
5
|
auth: {
|
package/dist/deploy/sbom.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const sbomDeactivated: (context:
|
|
3
|
-
export declare const getDependencyTrackUploadScript: (context:
|
|
4
|
-
export declare const getDependencyTrackDeleteScript: (context:
|
|
1
|
+
import type { ComponentContext } from "../types/context";
|
|
2
|
+
export declare const sbomDeactivated: (context: ComponentContext) => boolean;
|
|
3
|
+
export declare const getDependencyTrackUploadScript: (context: ComponentContext) => string[];
|
|
4
|
+
export declare const getDependencyTrackDeleteScript: (context: ComponentContext) => string[];
|
package/dist/deploy/utils.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { Config,
|
|
1
|
+
import type { Config, ComponentContext } from "../types";
|
|
2
2
|
import type { DeployConfigKubernetesCluster } from "./types";
|
|
3
3
|
export declare const getFullKubernetesClusterName: (cluster: DeployConfigKubernetesCluster) => string | undefined;
|
|
4
4
|
export declare const getKubernetesNamespace: (config: Pick<Config, "customerName" | "appName">, env: string) => string;
|
|
5
|
-
export declare const contextIsStoppable: (context:
|
|
5
|
+
export declare const contextIsStoppable: (context: ComponentContext) => boolean;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { CreateComponentContextContext } from "../context";
|
|
2
2
|
import type { CatladderJobWithContext } from "../types/context";
|
|
3
|
-
export declare const createJobsForComponent: (contextContext: Omit<
|
|
3
|
+
export declare const createJobsForComponent: (contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">) => Promise<Array<CatladderJobWithContext>>;
|
|
@@ -205,7 +205,7 @@ var createJobsForComponent = function (contextContext) {
|
|
|
205
205
|
return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfo)(contextContext.config, contextContext.componentName)];
|
|
206
206
|
case 1:
|
|
207
207
|
packageManagerInfo = _a.sent();
|
|
208
|
-
return [4 /*yield*/, (0, context_1.
|
|
208
|
+
return [4 /*yield*/, (0, context_1.createComponentContext)(__assign(__assign({}, contextContext), {
|
|
209
209
|
packageManagerInfo: packageManagerInfo
|
|
210
210
|
}))];
|
|
211
211
|
case 2:
|
|
@@ -143,7 +143,7 @@ var createMainPipeline_1 = require("./createMainPipeline");
|
|
|
143
143
|
var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
|
|
144
144
|
function generatePipelineFiles(config, pipelineType, mode) {
|
|
145
145
|
return __awaiter(this, void 0, void 0, function () {
|
|
146
|
-
var trigger, _a, jobs, mainPipeline, _b, jobs, mainPipeline;
|
|
146
|
+
var trigger, _a, jobs, image, stages, variables, workflow, mainPipeline, _b, jobs, image, stages, variables, workflow, mainPipeline;
|
|
147
147
|
return __generator(this, function (_c) {
|
|
148
148
|
switch (_c.label) {
|
|
149
149
|
case 0:
|
|
@@ -151,9 +151,14 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
151
151
|
trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
|
|
152
152
|
return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
|
|
153
153
|
case 1:
|
|
154
|
-
_a = _c.sent(), jobs = _a.jobs, mainPipeline = __rest(_a, ["jobs"]);
|
|
154
|
+
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, mainPipeline = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
155
155
|
// need to spread out the jobs, forgot why
|
|
156
|
-
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({
|
|
156
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({
|
|
157
|
+
image: image,
|
|
158
|
+
stages: stages,
|
|
159
|
+
variables: variables,
|
|
160
|
+
workflow: workflow
|
|
161
|
+
}, mainPipeline), jobs))];
|
|
157
162
|
case 2:
|
|
158
163
|
// need to spread out the jobs, forgot why
|
|
159
164
|
_c.sent();
|
|
@@ -161,9 +166,14 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
161
166
|
case 3:
|
|
162
167
|
return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
|
|
163
168
|
case 4:
|
|
164
|
-
_b = _c.sent(), jobs = _b.jobs, mainPipeline = __rest(_b, ["jobs"]);
|
|
169
|
+
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, mainPipeline = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
165
170
|
// need to spread out the jobs, forgot why
|
|
166
|
-
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({
|
|
171
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({
|
|
172
|
+
image: image,
|
|
173
|
+
stages: stages,
|
|
174
|
+
variables: variables,
|
|
175
|
+
workflow: workflow
|
|
176
|
+
}, mainPipeline), jobs))];
|
|
167
177
|
case 5:
|
|
168
178
|
// need to spread out the jobs, forgot why
|
|
169
179
|
_c.sent();
|