From 4dbb0eb2e2dca2bf4443a96204a6d276a8614a4c Mon Sep 17 00:00:00 2001
From: Dawid Ciepiela <71898979-sarumaj@users.noreply.github.com>
Date: Wed, 15 Nov 2023 21:41:55 +0100
Subject: [PATCH] try different release action

---
 .github/workflows/build_and_release.yml | 22 +++++++---------------
 scripts/setup.iss                       |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
index 7ffb047..f7e7a7a 100644
--- a/.github/workflows/build_and_release.yml
+++ b/.github/workflows/build_and_release.yml
@@ -7,14 +7,14 @@ permissions:
   contents: write
 
 jobs:
-  build:
+  build_and_release:
     strategy:
       fail-fast: false
       matrix:
         python: [3.11]
         os: [windows-latest]
     runs-on: ${{ matrix.os }}
-    name: Build kanjireader
+    name: Build and release kanjireader
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -34,18 +34,10 @@ jobs:
           path: "scripts/setup.iss"
           options: /DVersion="${{ github.ref_name }}"
 
-  release:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    name: Release kanjireader
-    needs: build
-    steps:
       - name: Create release and upload
-        uses: meeDamian/github-release@2.0
+        uses: softprops/action-gh-release@v1
         with:
-          allow_override: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          files: "kanjireader_${{ github.ref_name }}_setup_.exe:dist/kr_setup.exe"
+          generate_release_notes: true
+          prerelease: false
+          draft: false
+          files: "dist/kanjireader_${{ github.ref_name }}_setup.exe"
diff --git a/scripts/setup.iss b/scripts/setup.iss
index 8002384..ee985b8 100644
--- a/scripts/setup.iss
+++ b/scripts/setup.iss
@@ -21,7 +21,7 @@ AllowNoIcons=yes
 PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir={#SourcePath}\..\dist
-OutputBaseFilename=kr_setup
+OutputBaseFilename=kanjireader_{#MyAppVersion}_setup
 SetupIconFile={#SourcePath}\..\src\data\img\ico\app.ico
 UninstallDisplayIcon={app}\data\img\ico\app.ico
 Compression=lzma