Merge pull request #133 from zowe-actions/fix/prepare-release-script

Support prerelease branches in prepareRelease script

docs/recipes.md

@@ -20,20 +20,20 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: 'lts/*'
 
     - name: Install Dependencies
       run: npm ci
 
     - name: Publish Release
-      uses: octorelease/octorelease@master
+      uses: zowe-actions/octorelease@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

docs/usage.md

@@ -28,7 +28,7 @@ $ npx octorelease
 **Note:** For projects that use GitHub workflows, you don't need to install Octorelease or run it with `npx`. It can be invoked as an action in your workflow instead:
 
 ```yaml
-- uses: octorelease/octorelease@master
+- uses: zowe-actions/octorelease@v1
 ```
 
 ## CI Configuration

esbuild.mjs

@@ -1,6 +1,8 @@
 import * as path from "path";
+import { fileURLToPath } from "url";
 import * as esbuild from "esbuild";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgName = process.argv[2] || path.basename(process.cwd());
 const onResolvePlugin = {
     name: "onResolve",
@@ -10,7 +12,7 @@ const onResolvePlugin = {
                 return { path: "./core", external: true };
             });
         } else {
-            build.onResolve({ filter: /^@octorelease\// }, (args) => {
+            build.onResolve({ filter: /^@octorelease\/[^\/]+$/ }, (args) => {
                 return { path: args.path.replace("@octorelease", "."), external: true };
             });
         }
@@ -21,7 +23,7 @@ await esbuild.build({
     bundle: true,
     entryPoints: [pkgName === "main" ? "src/main.ts" : "src/index.ts"],
     logLevel: "info",
-    outfile: `../../dist/${pkgName === "main" ? "index" : pkgName}.js`,
+    outfile: `${__dirname}/dist/${pkgName === "main" ? "index" : pkgName}.js`,
     platform: "node",
     plugins: [onResolvePlugin]
 });

package.json

@@ -21,7 +21,8 @@
   "author": "t1m0thyj",
   "license": "Apache-2.0",
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "script"
   ],
   "devDependencies": {
     "@types/jest": "^29.4.0",

packages/run-script/README.md → script/README.md

@@ -27,7 +27,7 @@ Custom working directory to use instead of the project root.
 ## Example usage
 
 ```yaml
-- uses: octorelease/run-script@master
+- uses: zowe-actions/octorelease/script@v1
   with:
     script: npmUpdate
 ```

packages/run-script/package.json → script/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "build": "tsc -b && npm run lint",
     "lint": "eslint src",
-    "pack": "node ../../esbuild.mjs",
+    "pack": "node ../esbuild.mjs run-script",
     "test": "echo \"Error: no test specified\" && exit 1",
     "watch": "tsc -w"
   },

packages/run-script/scripts/prepareRelease.ts → script/scripts/prepareRelease.ts

@@ -21,8 +21,11 @@ import { version as lernaVersion } from "@octorelease/lerna";
 import { version as npmVersion } from "@octorelease/npm";
 
 export default async function (context: IContext): Promise<void> {
-    context.version.new = (context.env.VERSION_STRING || "%s").replace("%s",
-        require("semver").inc(context.version.old, context.branch.level));
+    context.version.new = context.version.old.split("-")[0];
+    if (!context.branch.prerelease && context.branch.level !== "none") {
+        context.version.new = require("semver").inc(context.version.new, context.branch.level);
+    }
+    context.version.new = (context.env.VERSION_STRING || "%s").replace("%s", context.version.new);
 
     const packageJson = JSON.parse(fs.readFileSync("package.json", "utf-8"));
     if (packageJson.workspaces != null) {

packages/run-script/scripts/sonarConfig.ts → script/scripts/sonarConfig.ts

@@ -18,7 +18,7 @@ import * as fs from "fs";
 import * as github from "@actions/github";
 import { IContext } from "@octorelease/core";
 import * as properties from "java-properties";
-import * as utils from "../src/utils";
+import * as utils from "@octorelease/run-script/src/utils";
 
 async function downloadCoverageReports(context: IContext) {
     // For GHA workflows triggered by workflow_run event, download coverage artifact from the triggering workflow

packages/run-script/tsconfig.json → script/tsconfig.json

@@ -1,16 +1,16 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "./lib",
     "rootDir": "./src"
   },
   "include": ["src"],
   "references": [
     {
-      "path": "../core"
+      "path": "../packages/core"
     },
     {
-      "path": "../git"
+      "path": "../packages/git"
     }
   ]
 }

tsconfig.json

@@ -32,10 +32,10 @@
       "path": "packages/npm"
     },
     {
-      "path": "packages/run-script"
+      "path": "packages/vsce"
     },
     {
-      "path": "packages/vsce"
-    }
+      "path": "script"
+    },
   ]
 }