@catladder/cli 0.0.0-main-e41cc8a1 → 0.0.0-main-aa3a9c56

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.
@@ -40917,7 +40917,7 @@ exports.readConfigSync = readConfigSync;
40917
40917
 
40918
40918
  exports.__esModule = true;
40919
40919
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40920
- exports.PIPELINE_IMAGE_TAG = "main-e41cc8a1" || 0;
40920
+ exports.PIPELINE_IMAGE_TAG = "main-aa3a9c56" || 0;
40921
40921
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40922
40922
 
40923
40923
  /***/ }),
@@ -42812,9 +42812,7 @@ var getJobCreateScripts = function (context) {
42812
42812
  exports.getJobCreateScripts = getJobCreateScripts;
42813
42813
  var getJobCreateScriptsForJob = function (context, jobName, job) {
42814
42814
  var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
42815
- // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
42816
- // lucky, update on the other hand accepts it... so let's just imediatly update it
42817
- // also we cannot upsert a job, so we have to create it and catch the error and then update
42815
+ // we cannot upsert a job, so we have to create it and catch the error and then update
42818
42816
  var commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
42819
42817
  var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
42820
42818
  command: '"' + commandArray.join(",") + '"'
@@ -42824,10 +42822,11 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
42824
42822
  })),
42825
42823
  image: job.image || commonDeployArgs.image,
42826
42824
  memory: job.memory || "512Mi",
42827
- "task-timeout": job.timeout || "10m"
42825
+ "task-timeout": job.timeout || "10m",
42826
+ "env-vars-file": "____envvars.yaml"
42828
42827
  }));
42829
42828
  var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
42830
- return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), ["".concat((0, common_1.gcloudRunCmd)(), " jobs update ").concat(argsString, " --env-vars-file=____envvars.yaml")], false);
42829
+ return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), ["".concat((0, common_1.gcloudRunCmd)(), " jobs update ").concat(argsString)], false);
42831
42830
  };
42832
42831
  var getCreateScheduleScripts = function (context) {
42833
42832
  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
@@ -355847,7 +355847,7 @@ exports.readConfigSync = readConfigSync;
355847
355847
 
355848
355848
  exports.__esModule = true;
355849
355849
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
355850
- exports.PIPELINE_IMAGE_TAG = "main-e41cc8a1" || 0;
355850
+ exports.PIPELINE_IMAGE_TAG = "main-aa3a9c56" || 0;
355851
355851
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
355852
355852
 
355853
355853
  /***/ }),
@@ -357742,9 +357742,7 @@ var getJobCreateScripts = function (context) {
357742
357742
  exports.getJobCreateScripts = getJobCreateScripts;
357743
357743
  var getJobCreateScriptsForJob = function (context, jobName, job) {
357744
357744
  var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
357745
- // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
357746
- // lucky, update on the other hand accepts it... so let's just imediatly update it
357747
- // also we cannot upsert a job, so we have to create it and catch the error and then update
357745
+ // we cannot upsert a job, so we have to create it and catch the error and then update
357748
357746
  var commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
357749
357747
  var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
357750
357748
  command: '"' + commandArray.join(",") + '"'
@@ -357754,10 +357752,11 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
357754
357752
  })),
357755
357753
  image: job.image || commonDeployArgs.image,
357756
357754
  memory: job.memory || "512Mi",
357757
- "task-timeout": job.timeout || "10m"
357755
+ "task-timeout": job.timeout || "10m",
357756
+ "env-vars-file": "____envvars.yaml"
357758
357757
  }));
357759
357758
  var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
357760
- return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), ["".concat((0, common_1.gcloudRunCmd)(), " jobs update ").concat(argsString, " --env-vars-file=____envvars.yaml")], false);
357759
+ return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), ["".concat((0, common_1.gcloudRunCmd)(), " jobs update ").concat(argsString)], false);
357761
357760
  };
357762
357761
  var getCreateScheduleScripts = function (context) {
357763
357762
  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
package/package.json CHANGED
@@ -52,7 +52,7 @@
52
52
  }
53
53
  ],
54
54
  "license": "MIT",
55
- "version": "0.0.0-main-e41cc8a1",
55
+ "version": "0.0.0-main-aa3a9c56",
56
56
  "scripts": {
57
57
  "lint": "eslint \"src/**/*.ts\"",
58
58
  "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
74
74
  "ts-node": "^10.9.1"
75
75
  },
76
76
  "devDependencies": {
77
- "@catladder/pipeline": "0.0.0-main-e41cc8a1",
77
+ "@catladder/pipeline": "0.0.0-main-aa3a9c56",
78
78
  "@gitbeaker/rest": "^39.28.0",
79
79
  "@kubernetes/client-node": "^0.16.2",
80
80
  "@tsconfig/node14": "^1.0.1",