Added update to support build_version, also issue with node-semver @ n…

…pm/node-semver#685 bypassed for now.
Bioblaze · Mar 6, 2024 · 5a10b8e · 5a10b8e
1 parent 4607c15
commit 5a10b8e
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,23 @@ The `Game-Semver-Action` is a GitHub Action designed to automatically generate a
 
 ## Outputs
 
+### `build_version`
+
+Example: 0.0.298-alpha+build.ee9050469dca1f407c6f21361054e05181d6a9e9
+
+```yaml
+steps:
+  - name: Generate Semver/w Build SHA
+    id: semver
+    uses: Bioblaze/game-semver-action@v1
+    with:
+      personal_github_token: ${{ secrets.PGITHUB_TOKEN }}
+      include_commit_sha: true
+
+  - name: Use the Generated Version
+    run: echo "The new version is ${{ steps.semver.outputs.build_version }}"
+```
+
 ### `version`
 
 The generated semantic version based on your commit history and action inputs. This version can be used in subsequent workflow steps, for example, to tag a release or to update version files within your project.

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/index.js b/lib/index.js
@@ -198,16 +198,22 @@ function getAndLogCommits() {
             if (identifier) {
                 version.prerelease = [identifier.trim().replace(/[^a-zA-Z0-9-]+/g, '')];
             }
-            let newVersion = version.format();
+            let NewVersion = version.format();
+            var newBuildVersion = NewVersion;
             if (includeCommitSha) {
                 const sha = getEventSHA();
                 core.debug(`SHA: ${sha}`);
                 if (sha) {
-                    newVersion = `${newVersion}+build.${sha}`;
+                    version.build = [`build.${sha}`];
+                    newBuildVersion = `${NewVersion}+build.${sha}`;
                 }
             }
-            core.exportVariable('version', newVersion);
-            core.setOutput('version', newVersion);
+            // https://github.com/npm/node-semver/issues/685
+            //let newVersion = version.format();
+            core.exportVariable('version', NewVersion);
+            core.setOutput('version', NewVersion);
+            core.exportVariable('build_version', newBuildVersion);
+            core.setOutput('build_version', newBuildVersion);
         }
         catch (error) {
             if (error instanceof Error) {

diff --git a/src/index.ts b/src/index.ts
@@ -156,17 +156,23 @@ async function getAndLogCommits(): Promise<void> {
             version.prerelease = [identifier.trim().replace(/[^a-zA-Z0-9-]+/g, '')];
         }
 
-        let newVersion = version.format();
-
+        let NewVersion = version.format();
+        var newBuildVersion = NewVersion;
         if (includeCommitSha) {
             const sha = getEventSHA();
             core.debug(`SHA: ${sha}`);
             if (sha) {
-                newVersion = `${newVersion}+build.${sha}`
+                version.build = [`build.${sha}`]
+                newBuildVersion = `${NewVersion}+build.${sha}`
             }
         }
-        core.exportVariable('version', newVersion);
-        core.setOutput('version', newVersion);
+
+        // https://github.com/npm/node-semver/issues/685
+        //let newVersion = version.format();
+        core.exportVariable('version', NewVersion);
+        core.setOutput('version', NewVersion);
+        core.exportVariable('build_version', newBuildVersion);
+        core.setOutput('build_version', newBuildVersion);
     } catch (error: unknown) {
         if (error instanceof Error) {
             core.setFailed(`An error occurred: ${error.message}`);