From e05224171387ae5489a382a9592213b052034e22 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Sat, 27 May 2023 23:28:37 +0300
Subject: [PATCH] Simplify workflows

---
 .github/workflows/docker.yml |  6 +-----
 .github/workflows/main.yml   | 18 ++++++------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a86a027a..139edb28 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -67,10 +67,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Get release version
-        id: get-version
-        uses: tyrrrz/action-get-tag@v1
-
       - name: Install Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -86,5 +82,5 @@ jobs:
           --platform linux/amd64,linux/arm64
           --push
           --tag tyrrrz/discordchatexporter:stable
-          --tag tyrrrz/discordchatexporter:${{ steps.get-version.outputs.tag }}
+          --tag tyrrrz/discordchatexporter:${{ github.ref_name }}
           .
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb9c3aff..98619eba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -123,15 +123,13 @@ jobs:
           -Force
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: |
-            DiscordChatExporter.Cli.zip
-            DiscordChatExporter.zip
-          body: |
-            [Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)
+        run: >
+          gh release create ${{ github.ref_name }} DiscordChatExporter.Cli.zip DiscordChatExporter.zip
+          --title ${{ github.ref_name }}
+          --notes "[Changelog](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/Changelog.md)"
+          --verify-tag
 
   notify:
     needs: deploy
@@ -140,10 +138,6 @@ jobs:
       contents: read
 
     steps:
-      - name: Get release version
-        id: get-version
-        uses: tyrrrz/action-get-tag@v1
-
       - name: Notify Discord
         uses: tyrrrz/action-http-request@v1
         with:
@@ -153,5 +147,5 @@ jobs:
             Content-Type: application/json; charset=UTF-8
           body: |
             {
-              "content": "**DiscordChatExporter** new version released!\nVersion: `${{ steps.get-version.outputs.tag }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ steps.get-version.outputs.tag }}/Changelog.md>"
+              "content": "**DiscordChatExporter** new version released!\nVersion: `${{ github.ref_name }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ github.ref_name }}/Changelog.md>"
             }
\ No newline at end of file