Fixing stage version

Author: DomPeliniAerospike

.github/workflows/stage-bump-version.js

@@ -1,20 +1,24 @@
 const semver = require('semver')
 
-const currentVersion = process.argv[2]
+const rawVersion = process.argv[2]
 
-const version = semver.parse(currentVersion)
+const rawDevVersion = process.argv[3]
 
-if (!version) {
+const version = semver.parse(rawVersion)
+
+const devVersion = semver.parse(rawDevVersion)
+
+
+if (!version || !devVersion) {
   console.error('Invalid version string')
   process.exit(1)
 }
 
-if (version.prerelease[0] === 'rc'){
-  version.inc('prerelease', 'rc')
-  console.log(version.format())
+if (semver.gt(devVersion, version)) {
+  devVersion.prerelease = ['rc', 1];
+  console.log(devVersion.format())
 }
-else {
-  version.prerelease = ['rc', 1];
-  console.log(version.format())
-
+else{
+  version.inc('prerelease', 'rc')
+  console.log(version.format()) 
 }

.github/workflows/stage-bump-version.yml

@@ -10,6 +10,10 @@ permissions:
 
 on:
   workflow_call:
+    inputs:
+      old_version:
+        type: string
+        required: true
     secrets:
       desk_mood:
         required: true
@@ -71,7 +75,7 @@ jobs:
       id: get-new-version
       run: |
         set -e
-        new_stage_version=$(node stage-bump-version.js ${{ needs.get-next-stage-jfrog-version.outputs.stage_version }} ) 
+        new_stage_version=$(node stage-bump-version.js ${{ needs.get-next-stage-jfrog-version.outputs.stage_version ${{ inputs.old_version }} }} ) 
         echo "new_stage_version=$new_stage_version" >> $GITHUB_OUTPUT
       working-directory: .github/workflows
 

.github/workflows/stage-workflow.yml

@@ -28,6 +28,8 @@ jobs:
       #comprehensive-tests,
     ]
     secrets: inherit
+    with:
+      old_version: ${{ needs.stage-get-jfrog-version.outputs.dev_version }}
 
   stage-reupload-addons-to-jfrog:
     name: Upload artifacts to JFrog