From f96e7ee88e3afe800f242557b99f61617517a9c5 Mon Sep 17 00:00:00 2001
From: derklaro <pasqual.koschmieder@easybill.de>
Date: Wed, 1 Mar 2023 14:24:51 +0100
Subject: [PATCH] ci: improve release action

---
 .github/workflows/draft_release.yml | 10 +++++-----
 build.gradle.kts                    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/draft_release.yml b/.github/workflows/draft_release.yml
index 7f20885..185e527 100644
--- a/.github/workflows/draft_release.yml
+++ b/.github/workflows/draft_release.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Compile
         run: ./gradlew build --no-daemon --stacktrace
 
-      - name: Resolve latest short commit SHA
-        run: echo "SHORT_COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV;
+      - name: Resolve project version
+        run: echo "VERSION=$(./gradlew properties | awk '/^version:/ { print $2; }')+b${{ github.run_number }}" >> $GITHUB_ENV;
 
       - name: Generate changelog
         id: changelog_generate
@@ -35,16 +35,16 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          commitMode: true
           ignorePreReleases: true
-          configurationJson: '{"tag_resolver":{"method":"sort"}}'
+          toTag: ${{ github.sha }}
+          configurationJson: '{"max_tags_to_fetch":5,"categories":[],"template":"#{{UNCATEGORIZED}}","pr_template":"- #{{TITLE}} (##{{NUMBER}} by #{{AUTHOR}})"}'
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
         with:
           draft: false
           prerelease: false
-          tag_name: ${{ env.SHORT_COMMIT_SHA }}
+          tag_name: ${{ env.VERSION }}
           body: ${{steps.changelog_generate.outputs.changelog}}
           fail_on_unmatched_files: true
           files: |
diff --git a/build.gradle.kts b/build.gradle.kts
index e2f9bd4..1865c7a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.easybill"
-version = "1.0-SNAPSHOT"
+version = "1.0.0-SNAPSHOT"
 
 repositories {
   mavenCentral()