@saltcorn/cli 1.4.0 → 1.4.1-beta.1

package/oclif.manifest.json

@@ -2091,6 +2091,10 @@
             "all",
             "none"
           ]
+        },
+        "tag": {
+          "description": "Docker tag to give this release",
+          "name": "tag"
         }
       },
       "description": "Post-release tasks: docker and vagrant builds",
@@ -2154,19 +2158,15 @@
           "description": "New version number",
           "name": "version",
           "required": true
-        }
-      },
-      "description": "Release a new saltcorn version",
-      "flags": {
+        },
         "tag": {
-          "char": "t",
-          "description": "NPM tag",
+          "description": "NPM tag to give this release",
           "name": "tag",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "required": true
         }
       },
+      "description": "Release a new saltcorn version",
+      "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
       "id": "dev:release",
@@ -2247,5 +2247,5 @@
       ]
     }
   },
-  "version": "1.4.0"
+  "version": "1.4.1-beta.1"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.4.0",
+  "version": "1.4.1-beta.1",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "4.4.0",
     "@oclif/plugin-plugins": "^5.4.26",
-    "@saltcorn/admin-models": "1.4.0",
-    "@saltcorn/common-code": "1.4.0",
-    "@saltcorn/data": "1.4.0",
-    "@saltcorn/mobile-app": "1.4.0",
-    "@saltcorn/mobile-builder": "1.4.0",
-    "@saltcorn/plugins-loader": "1.4.0",
-    "@saltcorn/server": "1.4.0",
+    "@saltcorn/admin-models": "1.4.1-beta.1",
+    "@saltcorn/common-code": "1.4.1-beta.1",
+    "@saltcorn/data": "1.4.1-beta.1",
+    "@saltcorn/mobile-app": "1.4.1-beta.1",
+    "@saltcorn/mobile-builder": "1.4.1-beta.1",
+    "@saltcorn/plugins-loader": "1.4.1-beta.1",
+    "@saltcorn/server": "1.4.1-beta.1",
     "contractis": "^0.1.0",
     "dateformat": "^4.6.3",
     "inquirer": "^12.3.3",

package/src/commands/dev/post-release.js

@@ -42,10 +42,17 @@ class PostReleaseCommand extends Command {
   get baseRepoDir() {
     return path.join(__dirname, "..", "..", "..", "..", "..");
   }
-  async docker() {
+  async docker(tag) {
+    if (!tag) {
+      console.error("Need tag for docker post-release");
+      this.exit(1);
+    }
+    const env = { ...process.env, TAG: tag };
+
     spawnSync("bash", ["deploy/docker_build_push.sh"], {
       stdio: "inherit",
       cwd: this.baseRepoDir,
+      env,
     });
   }
   async vagrant() {
@@ -123,18 +130,14 @@ class PostReleaseCommand extends Command {
    */
   async run() {
     const {
-      args: { task },
+      args: { task, tag },
     } = await this.parse(PostReleaseCommand);
-    this.version = require(path.join(
-      __dirname,
-      "..",
-      "..",
-      "..",
-      "package.json"
-    )).version;
+    this.version = require(
+      path.join(__dirname, "..", "..", "..", "package.json")
+    ).version;
     console.log("Version", this.version);
     if (!this.version) this.exit(1);
-    if (!task || task === "docker" || task === "all") await this.docker();
+    if (!task || task === "docker" || task === "all") await this.docker(tag);
 
     if (!task || task === "vagrant" || task === "all") await this.vagrant();
     this.exit(0);
@@ -154,6 +157,9 @@ PostReleaseCommand.args = {
     options: ["docker", "vagrant", "all", "none"],
     description: "What to do",
   }),
+  tag: Args.string({
+    description: "Docker tag to give this release",
+  }),
 };
 
 module.exports = PostReleaseCommand;

package/src/commands/dev/release.js

@@ -31,8 +31,7 @@ class ReleaseCommand extends Command {
    */
   async run() {
     const {
-      args: { version },
-      flags,
+      args: { version, tag },   
     } = await this.parse(ReleaseCommand);
     runCmd("git", ["pull"], {
       stdio: "inherit",
@@ -124,8 +123,7 @@ class ReleaseCommand extends Command {
       });
     };
     const publish = async (dir, tags0) => {
-      const tags = !tags0 ? [] : Array.isArray(tags0) ? tags0 : [tags0];
-      if (flags.tag) tags.push(flags.tag);
+      const tags = !tags0 ? [] : Array.isArray(tags0) ? tags0 : [tags0];    
       const firstTag = tags[0];
       runCmd(
         "npm",
@@ -217,7 +215,7 @@ class ReleaseCommand extends Command {
         stdio: "inherit",
         cwd: `packages/saltcorn-cli/`,
       });*/
-    await publish("saltcorn-cli");
+    await publish("saltcorn-cli", tag);
     fs.writeFileSync(`package.json`, JSON.stringify(rootPackageJson, null, 2));
     // update Dockerfile
     const dockerfile = fs.readFileSync(`Dockerfile.release`, "utf8");
@@ -268,12 +266,10 @@ ReleaseCommand.args = {
     required: true,
     description: "New version number",
   }),
-};
-
-ReleaseCommand.flags = {
-  tag: Flags.string({
-    char: "t",
-    description: "NPM tag",
+  tag: Args.string({
+    required: true,
+    description: "NPM tag to give this release",
   }),
 };
+
 module.exports = ReleaseCommand;