From a75c68c6bf40090d627fef099e5d8a0f669f51e4 Mon Sep 17 00:00:00 2001
From: Jakob Ecker <jakob.ecker42@gmail.com>
Date: Sat, 16 Mar 2024 01:44:40 +0100
Subject: [PATCH] Work around 'version' containing the release name

---
 .github/workflows/release.yml | 3 +--
 desktop-app/build.gradle.kts  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8d6972a..f177f77 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,6 @@ jobs:
           use_github_release_notes: true
     outputs:
       tag_name: ${{ steps.release.outputs.tag_name }}
-      version: ${{ steps.release.outputs.version }}
 
   package:
     needs: version
@@ -55,7 +54,7 @@ jobs:
       - name: Build & Package
         run: ./gradlew packageDistributionForCurrentOS --no-daemon
         env:
-          RELEASE_VERSION: ${{ needs.version.outputs.version }}
+          RELEASE_VERSION: ${{ needs.version.outputs.tag_name }}
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/desktop-app/build.gradle.kts b/desktop-app/build.gradle.kts
index da9e357..66f066b 100644
--- a/desktop-app/build.gradle.kts
+++ b/desktop-app/build.gradle.kts
@@ -44,7 +44,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Deb, TargetFormat.Exe)
             packageName = rootProject.name
-            version = System.getenv("RELEASE_VERSION") ?: "0.0.0"
+            version = System.getenv("RELEASE_VERSION")?.trimStart('v') ?: "0.0.0"
             description = "Tournament planner for HEMA tournaments of the club 'Fior della Spada'"
             copyright = "© 2024 Jakob Ecker. All rights reserved."
             licenseFile = rootProject.file("LICENCE")