Merge pull request #129 from zowe-actions/fix/allow-first-time-publish2

Fix wrong independent version on first time publish
zowe-actions · Feb 5, 2024 · 3ee426d · 3ee426d
2 parents c8cbcd5 + 0345062
commit 3ee426d
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 34 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,13 +24,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         ref: ${{ github.ref }}
 
     - name: Use Node.js 16
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 16.x
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 'lts/*'
 
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/action.yml b/action.yml
@@ -28,5 +28,5 @@ inputs:
     default: ''
 # outputs:
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'
diff --git a/dist/changelog.js b/dist/changelog.js
diff --git a/dist/core.js b/dist/core.js
diff --git a/dist/github.js b/dist/github.js
diff --git a/dist/lerna.js b/dist/lerna.js
diff --git a/packages/changelog/src/version.ts b/packages/changelog/src/version.ts
@@ -88,11 +88,14 @@ function getPackageChangelog(context: IContext, changelogFile: string, headerLin
 }
 
 function updatePackageChangelog(context: IContext, changelogFile: string, headerLine: string): boolean {
-    if (context.version.new !== context.version.old && fs.existsSync(changelogFile)) {
+    if (fs.existsSync(changelogFile)) {
         const oldContents = fs.readFileSync(changelogFile, "utf-8");
         const newVersion = context.version.overrides[path.dirname(changelogFile)]?.new || context.version.new;
-        const newContents = oldContents.replace(headerLine, `## \`${newVersion}\``);
+        if (oldContents.includes(`## \`${newVersion}\``)) {
+            return false;
+        }
 
+        const newContents = oldContents.replace(headerLine, `## \`${newVersion}\``);
         if (newContents !== oldContents) {
             fs.writeFileSync(changelogFile, newContents);
             context.logger.info(`Updated version header in ${changelogFile}`)

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -129,15 +129,17 @@ export async function verifyConditions(context: IContext): Promise<void> {
     }
 
     const semver = require("semver");
-    const semverLevel = semver.diff(context.version.old.split("-")[0], context.version.new.split("-")[0]);
+    const semverLevel = context.version.old !== "0.0.0" ?
+        semver.diff(context.version.old.split("-")[0], context.version.new.split("-")[0]) : null;
     for (const versionInfo of Object.values(context.version.overrides)) {
-        versionInfo.new = semver.inc(versionInfo.old.split("-")[0], semverLevel);
+        versionInfo.new = semverLevel != null ?
+            semver.inc(versionInfo.old.split("-")[0], semverLevel) : versionInfo.old;
         if (versionInfo.prerelease != null) {
             versionInfo.new = `${versionInfo.new}-${versionInfo.prerelease}`;
         }
     }
 
-    if (semverLevel != null && context.branch.level != null && context.version.old != "0.0.0" &&
+    if (semverLevel != null && context.branch.level != null &&
         SemverDiffLevels.indexOf(semverLevel) > SemverDiffLevels.indexOf(context.branch.level)) {
         throw new Error(`Protected branch ${context.branch.name} does not allow ${semverLevel} version changes`);
     }

diff --git a/packages/github/src/init.ts b/packages/github/src/init.ts
@@ -29,7 +29,8 @@ export default async function (context: IContext, config: IPluginConfig): Promis
 
     if (config.checkPrLabels && Inputs.newVersion == null) {
         const releaseType = await getPrReleaseType(context, config);
-        const oldVersion = (context.version.new || context.version.old).split("-")[0];
+        context.version.old = context.version.new || context.version.old;
+        const oldVersion = context.version.old.split("-")[0];
         context.version.new = releaseType != null ? require("semver").inc(oldVersion, releaseType) : oldVersion;
     }
 }

diff --git a/packages/lerna/src/config.ts b/packages/lerna/src/config.ts
@@ -16,7 +16,10 @@
 
 import { IPluginConfig as NpmPluginConfig } from "@octorelease/npm";
 
+export const IS_LERNA_JSON_TEMP = Symbol();
+
 export type IPluginConfig = NpmPluginConfig & {
     pruneShrinkwrap?: boolean | string[];
     versionIndependent?: string[];
+    [IS_LERNA_JSON_TEMP]?: boolean;
 };
diff --git a/packages/lerna/src/init.ts b/packages/lerna/src/init.ts
@@ -18,17 +18,20 @@ import * as fs from "fs";
 import * as path from "path";
 import { IContext } from "@octorelease/core";
 import { DEFAULT_NPM_REGISTRY, utils as npmUtils } from "@octorelease/npm";
-import { IPluginConfig } from "./config";
+import { IPluginConfig, IS_LERNA_JSON_TEMP } from "./config";
 import * as utils from "./utils";
 
 export default async function (context: IContext, config: IPluginConfig): Promise<void> {
     let publishConfig;
-    try {
-        const lernaJson = JSON.parse(fs.readFileSync("lerna.json", "utf-8"));
-        context.version.new = lernaJson.version;
-        publishConfig = lernaJson.command?.publish;
-    } catch {
-        throw new Error(`Missing or invalid lerna.json in branch ${context.branch.name}`);
+    config[IS_LERNA_JSON_TEMP] = !fs.existsSync("lerna.json");
+    if (!config[IS_LERNA_JSON_TEMP]) {
+        try {
+            const lernaJson = JSON.parse(fs.readFileSync("lerna.json", "utf-8"));
+            context.version.new = lernaJson.version;
+            publishConfig = lernaJson.command?.publish;
+        } catch {
+            throw new Error(`Missing or invalid lerna.json in branch ${context.branch.name}`);
+        }
     }
 
     try {
@@ -37,6 +40,13 @@ export default async function (context: IContext, config: IPluginConfig): Promis
         if (publishConfig == null) {
             publishConfig = packageJson.publishConfig;
         }
+        if (config[IS_LERNA_JSON_TEMP]) {
+            context.version.new = packageJson.version;
+            fs.writeFileSync("lerna.json", JSON.stringify({
+                version: packageJson.version,
+                useWorkspaces: true
+            }, null, 2));
+        }
     } catch {
         throw new Error(`Missing or invalid package.json in branch ${context.branch.name}`);
     }

diff --git a/packages/lerna/src/version.ts b/packages/lerna/src/version.ts
@@ -20,7 +20,7 @@ import findUp from "find-up";
 import * as glob from "@actions/glob";
 import { IContext } from "@octorelease/core";
 import { utils as npmUtils } from "@octorelease/npm";
-import { IPluginConfig } from "./config";
+import { IPluginConfig, IS_LERNA_JSON_TEMP } from "./config";
 import * as utils from "./utils";
 
 export default async function (context: IContext, config: IPluginConfig): Promise<void> {
@@ -47,7 +47,10 @@ export default async function (context: IContext, config: IPluginConfig): Promis
     }
 
     await utils.lernaPostVersion(); // Update lockfile because lerna doesn't
-    context.changedFiles.push("lerna.json", "package.json");
+    context.changedFiles.push("package.json");
+    if (!config[IS_LERNA_JSON_TEMP]) {
+        context.changedFiles.push("lerna.json");
+    }
     const lockfilePath = await findUp(["pnpm-lock.yaml", "yarn.lock", "npm-shrinkwrap.json", "package-lock.json"]);
     if (lockfilePath != null) {
         context.changedFiles.push(path.relative(context.rootDir, lockfilePath));

diff --git a/script/action.yml b/script/action.yml
@@ -22,5 +22,5 @@ outputs:
   result:
     description: 'The output of the script for other steps to reference'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: '../dist/run-script.js'