@catladder/cli 0.0.0-main-6fc5cb4e → 0.0.0-main-8ee27ffe

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 (3) hide show
  1. package/dist/bundles/catenv/index.js +5 -3
  2. package/dist/bundles/cli/index.js +5 -3
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -40107,7 +40107,7 @@ exports.readConfigSync = readConfigSync;
40107
40107
 
40108
40108
  exports.__esModule = true;
40109
40109
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40110
- exports.PIPELINE_IMAGE_TAG = "main-6fc5cb4e" || 0;
40110
+ exports.PIPELINE_IMAGE_TAG = "main-8ee27ffe" || 0;
40111
40111
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40112
40112
 
40113
40113
  /***/ }),
@@ -41453,9 +41453,11 @@ var createGoogleCloudRunDeployJobs = function (context) {
41453
41453
  }).flat();
41454
41454
  };
41455
41455
  var getDeleteJobsScripts = function () {
41456
- return jobsWithNames.map(function (_a) {
41456
+ return jobsWithNames.flatMap(function (_a) {
41457
41457
  var jobName = _a.jobName;
41458
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
41458
+ return [
41459
+ // first delete all job executions. Otherwise delete might fail if one of those is still running
41460
+ "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {} --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
41459
41461
  });
41460
41462
  };
41461
41463
  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
package/dist/bundles/cli/index.js CHANGED
@@ -351395,7 +351395,7 @@ exports.readConfigSync = readConfigSync;
351395
351395
 
351396
351396
  exports.__esModule = true;
351397
351397
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351398
- exports.PIPELINE_IMAGE_TAG = "main-6fc5cb4e" || 0;
351398
+ exports.PIPELINE_IMAGE_TAG = "main-8ee27ffe" || 0;
351399
351399
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351400
351400
 
351401
351401
  /***/ }),
@@ -352741,9 +352741,11 @@ var createGoogleCloudRunDeployJobs = function (context) {
352741
352741
  }).flat();
352742
352742
  };
352743
352743
  var getDeleteJobsScripts = function () {
352744
- return jobsWithNames.map(function (_a) {
352744
+ return jobsWithNames.flatMap(function (_a) {
352745
352745
  var jobName = _a.jobName;
352746
- return "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString);
352746
+ return [
352747
+ // first delete all job executions. Otherwise delete might fail if one of those is still running
352748
+ "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {} --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
352747
352749
  });
352748
352750
  };
352749
352751
  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
package/package.json CHANGED
@@ -24,7 +24,7 @@
24
24
  "node": ">=12.0.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@catladder/pipeline": "0.0.0-main-6fc5cb4e",
27
+ "@catladder/pipeline": "0.0.0-main-8ee27ffe",
28
28
  "@kubernetes/client-node": "^0.16.2",
29
29
  "@tsconfig/node14": "^1.0.1",
30
30
  "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
57
57
  "typescript": "^4.5.4",
58
58
  "vorpal": "^1.12.0"
59
59
  },
60
- "version": "0.0.0-main-6fc5cb4e",
60
+ "version": "0.0.0-main-8ee27ffe",
61
61
  "stableVersion": "0.0.0"
62
62
  }