Use PreRelease GitVersion Indices (#28)

* use pre release indices instead of build meta data

* format

* add message for updated version number

* Update action.yml

Try to use environment variables instead for the linux systems

* Update action.yml

remove quotations from version variable

* rename

Author: mns4595

CollectReleaseArtifacts/action.yml

@@ -18,9 +18,9 @@ inputs:
 runs:
   using: composite
   steps:
-    - run: ${{ github.action_path }}\script.py "${{ inputs.version }}" "${{inputs.artifacts}}" "${{ inputs.destination }}"
+    - run: ${{ github.action_path }}\script.py ${{ inputs.version }} "${{inputs.artifacts}}" "${{ inputs.destination }}"
       shell: powershell
       if: runner.os != 'Linux'
-    - run: python3 ${GITHUB_ACTION_PATH}/script.py "${{ inputs.version }}" "${{inputs.artifacts}}" "${{ inputs.destination }}"
+    - run: python3 ${GITHUB_ACTION_PATH}/script.py ${{ inputs.version }} "${{inputs.artifacts}}" "${{ inputs.destination }}"
       if: runner.os == 'Linux'
       shell: bash

ExecuteGitVersion/action.yml

@@ -9,8 +9,10 @@ outputs:
     value: ${{ steps.gitversion.outputs.minor }}
   patch:
     value: ${{ steps.gitversion.outputs.patch }}
-  build:
+  preReleaseTag:
     value: ${{ steps.gitversion.outputs.PreReleaseTag }}
+  preReleaseNumber:
+    value: ${{ steps.gitversion.outputs.PreReleaseNumber }}
   fullSemVer:
     value: ${{ steps.gitversion.outputs.fullSemVer }}
 

WriteBuildVersion/action.yml

@@ -15,19 +15,22 @@ inputs:
   patch_version:
     description: The Patch version
     required: true
-  build_version:
-    description: The Build version
+  pre_release_tag:
+    description: The pre-release tag
+    required: true
+  pre_release_number:
+    description: The pre-release number
     required: true
 
 runs:
   using: composite
   steps:
-    - run: ${{ github.action_path }}\script.py ${{inputs.filepath}} ${{inputs.major_version}} ${{inputs.minor_version}} ${{inputs.patch_version}} ${{inputs.build_version}}
+    - run: ${{ github.action_path }}\script.py ${{inputs.filepath}} ${{inputs.major_version}} ${{inputs.minor_version}} ${{inputs.patch_version}} ${{inputs.pre_release_tag}} ${{inputs.pre_release_number}}
       shell: powershell
       if: runner.os != 'Linux'
     - run: ls -al ${GITHUB_ACTION_PATH}
       shell: bash
       if: runner.os == 'Linux'
-    - run: python3 ${GITHUB_ACTION_PATH}/script.py ${{inputs.filepath}} ${{inputs.major_version}} ${{inputs.minor_version}} ${{inputs.patch_version}} ${{inputs.build_version}}
+    - run: python3 ${GITHUB_ACTION_PATH}/script.py ${{inputs.filepath}} ${{inputs.major_version}} ${{inputs.minor_version}} ${{inputs.patch_version}} ${{inputs.pre_release_tag}} ${{inputs.pre_release_number}}
       if: runner.os == 'Linux'
       shell: bash

WriteBuildVersion/script.py

@@ -7,10 +7,16 @@
 import sys
 import os
 
-def main(filepath, major, minor, patch, build):
+def main(filepath, major, minor, patch, pre_release_tag, pre_release_number):
+    # Figure out which pre-release index to use
+    if(pre_release_tag.isnumeric()):
+        build = pre_release_tag
+    else:
+        build = pre_release_number
+
     # We first check to see if the file exists
     if (os.path.isfile(filepath)):
-        print("Updating BuildVersion.h")
+        print("Updating BuildVersion.h with "+major+"."+minor+"."+patch+"+"+build)
 
         for line in fileinput.input(filepath, inplace = 1):
             if "major" in line:
@@ -30,13 +36,14 @@ def main(filepath, major, minor, patch, build):
 
 if __name__ == '__main__':
     # Get major, minor, and patch versions from inputs
-    if len(sys.argv) < 5:
-        sys.exit("Correct usage: script.py <file_path> <major version> <minor number> <patch number> <build number>")
+    if len(sys.argv) < 6:
+        sys.exit("Correct usage: script.py <file_path> <major version> <minor number> <patch number> <PreRelease Tag> <PreRelease Number>")
 
     filepath = sys.argv[1]
     major = sys.argv[2]
     minor = sys.argv[3]
     patch = sys.argv[4]
-    build = sys.argv[5] if len(sys.argv) == 6 else '0'
+    pre_release_tag = sys.argv[5]
+    pre_release_number = sys.argv[6]
 
-    main(filepath, major, minor, patch, build)
+    main(filepath, major, minor, patch, pre_release_tag, pre_release_number)