Patch version (#37)

* Add SMF_PLUGIN_PATCH_VERSION to build_plugin workflow.

* Update build_plugin.yml

* Update create_release.yml

* Pass the SMF_PLUGIN_PATCH_VERSION through all the workflows.

* Pass SMF_PLUGIN_PATCH_VERSION to windows cmake.

* EBP-330:  Add type to all required intputs

* Added a missing `$` to workflow file that introduces input variable.

Author: RagnarPaulson

.github/workflows/build_plugin.yml

@@ -18,6 +18,11 @@ on:
         description: "Patch version of the wireshark tag to use when building plugin"
         required: false
         default: ''
+      SMF_PLUGIN_PATCH_VERSION:
+        description: "PATCH for SMF plugin"
+        type: string
+        required: true
+        default: ''
 jobs:
   # Commenting out intel mac for regular builds as it is currently broken.
   #build_macos:
@@ -32,15 +37,20 @@ jobs:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || 'dev' }}
   build_windows:
     uses: ./.github/workflows/windows.yml
     with:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
+      # this goes into FILEVERSION which appears when you hover over the DLL, but cannot 
+      # contain a string like "dev"
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || '0' }}
   build_linux:
     uses: ./.github/workflows/ubuntu.yml
     with:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || 'dev' }}

.github/workflows/create_release.yml

@@ -16,6 +16,7 @@ on:
           default: '0'
       SMF_PLUGIN_PATCH_VERSION:
         description: "PATCH for SMF plugin"
+        type: string
         required: true
         default: ''
 env:
@@ -30,21 +31,24 @@ jobs:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
-
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || '0' }}
+  
   build_windows:
     uses: SolaceLabs/wireshark-smf-plugin/.github/workflows/windows.yml@main
     with:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
-
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || '0' }}
+    
   build_macos:
     uses: SolaceLabs/wireshark-smf-plugin/.github/workflows/macos_arm64.yml@main
     with:
       MAJOR_VERSION: ${{ inputs.MAJOR_VERSION || '4' }}
       MINOR_VERSION: ${{ inputs.MINOR_VERSION || '6' }}
       PATCH_VERSION: ${{ inputs.PATCH_VERSION || '0' }}
-
+      SMF_PLUGIN_PATCH_VERSION: ${{ inputs.SMF_PLUGIN_PATCH_VERSION || '0' }}
+      
   create_release:
     runs-on: ubuntu-latest
     # Wait for all jobs to finish before continuing

.github/workflows/macos.yml

@@ -20,6 +20,11 @@ on:
         type: string
         required: true
         default: "0"
+      SMF_PLUGIN_PATCH_VERSION:
+        description: "PATCH for SMF plugin"
+        type: string
+        required: true
+        default: ""
 
 jobs:
   macos:
@@ -76,7 +81,7 @@ jobs:
             -DPython_FIND_STRATEGY=LOCATION \
             -DSMF_PLUGIN_MAJOR_VERSION=${{ inputs.MAJOR_VERSION }} \
             -DSMF_PLUGIN_MINOR_VERSION=${{ inputs.MINOR_VERSION }} \
-            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.PATCH_VERSION }} \
+            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.SMF_PLUGIN_PATCH_VERSION }} \
             -DSMF_PLUGIN_COMMIT_HASH=0 \
             -DCMAKE_POLICY_DEFAULT_CMP0094=NEW
 

.github/workflows/macos_arm64.yml

@@ -35,6 +35,11 @@ on:
         type: string
         required: true
         default: '0'
+      SMF_PLUGIN_PATCH_VERSION:
+        description: "PATCH for SMF plugin"
+        type: string
+        required: true
+        default: ''
 
 env:
   # This is the name for the file in releases
@@ -102,7 +107,7 @@ jobs:
             -DPython_EXECUTABLE=${{ env.pythonLocation }}/bin/python \
             -DSMF_PLUGIN_MAJOR_VERSION=${{ inputs.MAJOR_VERSION }} \
             -DSMF_PLUGIN_MINOR_VERSION=${{ inputs.MINOR_VERSION }} \
-            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.PATCH_VERSION }} \
+            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.SMF_PLUGIN_PATCH_VERSION }} \
             -DSMF_PLUGIN_COMMIT_HASH=0 \
             -DPython_FIND_STRATEGY=LOCATION
 

.github/workflows/ubuntu.yml

@@ -35,6 +35,11 @@ on:
         type: string
         required: true
         default: '0'
+      SMF_PLUGIN_PATCH_VERSION:
+        description: "PATCH for SMF plugin"
+        type: string
+        required: true
+        default: ''
 
 env:
   # This is the name for the file in releases
@@ -77,7 +82,7 @@ jobs:
         run: cmake -GNinja ${{ github.workspace }}/wireshark \
             -DSMF_PLUGIN_MAJOR_VERSION=${{ inputs.MAJOR_VERSION }} \
             -DSMF_PLUGIN_MINOR_VERSION=${{ inputs.MINOR_VERSION }} \
-            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.PATCH_VERSION }} \
+            -DSMF_PLUGIN_PATCH_VERSION=${{ inputs.SMF_PLUGIN_PATCH_VERSION }} \
             -DSMF_PLUGIN_COMMIT_HASH=0
 
       - name: Build

.github/workflows/windows.yml

@@ -35,6 +35,11 @@ on:
         type: string
         required: true
         default: '0'
+      SMF_PLUGIN_PATCH_VERSION:
+        description: "PATCH for SMF plugin"
+        type: string
+        required: true
+        default: ''
 
 env:
   # This is the name for the file in releases
@@ -101,7 +106,7 @@ jobs:
 
       - name: Cmake
         run: |
-          cmake -DUSE_qt6=ON -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 ../wireshark -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DPython3_ROOT_DIR='${{ env.Python3_ROOT_DIR }}' -DPython3_EXECUTABLE='${{ env.Python3_ROOT_DIR }}\python.exe' -DPython3_LIBRARY='${{ env.Python3_ROOT_DIR }}\libs\python380.lib' -DPython3_INCLUDE_DIR='${{ env.Python3_ROOT_DIR }}\Include'
+          cmake -DUSE_qt6=ON -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 ../wireshark -DCMAKE_POLICY_DEFAULT_CMP0094=NEW -DPython3_ROOT_DIR='${{ env.Python3_ROOT_DIR }}' -DPython3_EXECUTABLE='${{ env.Python3_ROOT_DIR }}\python.exe' -DPython3_LIBRARY='${{ env.Python3_ROOT_DIR }}\libs\python380.lib' -DPython3_INCLUDE_DIR='${{ env.Python3_ROOT_DIR }}\Include' -DSMF_PLUGIN_PATCH_VERSION='${{ inputs.SMF_PLUGIN_PATCH_VERSION }}'
         env:
           PLATFORM: x64
           WIRESHARK_BASE_DIR: C:/wireshark-libs