From d6a6bdc546f6e015cdf98668f0656d17e97fb520 Mon Sep 17 00:00:00 2001
From: Maxim Logaev <maxlogaev@proton.me>
Date: Mon, 1 Apr 2024 16:44:43 +0300
Subject: [PATCH] Now don't use broken gh-describe

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>
---
 .github/workflows/build-win64.yml |  5 +---
 .github/workflows/build.yml       | 42 +++++++++++++------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
index 0248b399..a5505a8f 100644
--- a/.github/workflows/build-win64.yml
+++ b/.github/workflows/build-win64.yml
@@ -12,9 +12,6 @@ jobs:
           install: git
       - run: git config --global core.autocrlf input
       - uses: actions/checkout@v4
-      - name: Git describe
-        id: ghd
-        uses: proudust/gh-describe@v2
       - name: Build Dino
         run: |
           msys2 -c './build-win64.sh --prepare'
@@ -35,4 +32,4 @@ jobs:
           file: windows-installer/dino-installer.exe
           asset_name: dino-installer.exe
           tag: ${{ github.ref }}
-          release_name: Dino ${{ steps.ghd.outputs.describe }}
\ No newline at end of file
+          release_name: Dino ${{ github.ref_name }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5f5a5b7..7e6f75cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,27 +31,21 @@ jobs:
       image: bilelmoussaoui/flatpak-github-actions:gnome-44
       options: --privileged
     steps:
-        - uses: actions/checkout@v4
-          with:
-            fetch-depth: 0
-            submodules: true
-        - run: flatpak repair --user
-        - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
-          with:
-              manifest-path: im.dino.Dino.json
-              build-bundle: true
-        - name: Git describe
-          if: ${{ github.ref_type == 'tag' }}
-          id: ghd
-          uses: proudust/gh-describe@v2
-          with:
-            default: ''
-        - name: Release Dino installer
-          if: ${{ github.ref_type == 'tag' }}
-          uses: svenstaro/upload-release-action@2.9.0
-          with:
-              repo_token: ${{ secrets.GITHUB_TOKEN }}
-              file: app.flatpak
-              asset_name: app.flatpak
-              tag: ${{ github.ref }}
-              release_name: Dino ${{ steps.ghd.outputs.describe }}
\ No newline at end of file
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+      - run: flatpak repair --user
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
+        with:
+          manifest-path: im.dino.Dino.json
+          build-bundle: true
+      - name: Release Dino installer
+        if: ${{ github.ref_type == 'tag' }}
+        uses: svenstaro/upload-release-action@2.9.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: app.flatpak
+          asset_name: app.flatpak
+          tag: ${{ github.ref }}
+          release_name: Dino ${{ github.ref_name }}