Fixed script and verison

eclipse-ecal · Apr 25, 2024 · 4b657bb · 4b657bb
1 parent 00ecbb1
commit 4b657bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -157,7 +157,13 @@ jobs:
     - name: Get Project version from git tag
       shell: bash
       run: |
-        echo "PROJECT_VERSION=$(git describe --tags --dirty)" >> "$GITHUB_ENV"
+        # Use git describe to get the tag / commit description
+        VERSION="$(git describe --tags --dirty)"
+
+        # Remove the leading 'v' from the tag
+        VERSION="${VERSION#v}"
+
+        echo "PROJECT_VERSION=$VERSION" >> "$GITHUB_ENV"
 
     - name: Set output binary name
       shell: bash

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -164,7 +164,12 @@ jobs:
     - name: Get Project version from git tag
       shell: powershell
       run: |
+        # Use git describe to get the tag / commit description
         $VERSION = git describe --tags --dirty
+
+        #remove the leading 'v' from the tag, if it exists
+        $VERSION = $VERSION -replace '^v', ''
+        
         echo "VERSION=$VERSION" >> "$Env:GITHUB_ENV"
 
     - name: Set output binary name
@@ -371,7 +376,7 @@ jobs:
 
     - name: Determine name of the installer for zip file
       shell: powershell
-      run:
+      run: |
         $INSTALLER_NAME = "${{ env.ASSET_NAME }}"
         $INSTALLER_NAME_WITHOUT_EXE = $INSTALLER_NAME.Substring(0, $INSTALLER_NAME.Length - 4)
         echo "ARTIFACT_NAME=$INSTALLER_NAME_WITHOUT_EXE" >> "$Env:GITHUB_ENV"