From f758312fb65b291d2a957d98cda7efdb42a26719 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 8 Feb 2025 19:08:25 +0100
Subject: [PATCH] fix(ci): move replacing version in desktop release to action

---
 .github/workflows/release.yml | 7 +++++--
 desktop/bumpp.sh              | 9 ---------
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100755 desktop/bumpp.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c7a064aa4..44a85d61d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,6 +37,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - name: Git describe
+        id: ghd
+        uses: proudust/gh-describe@v2
       - name: Set version
         id: version
         run: |
@@ -46,14 +49,14 @@ jobs:
             VERSION="unstable"
           fi
           echo version=$VERSION >> "$GITHUB_OUTPUT"
-
       - name: Build desktop app
         working-directory: desktop
         run: |
           wget "https://dl.vikunja.io/frontend/vikunja-frontend-${{ steps.version.outputs.version }}.zip"
           unzip "vikunja-frontend-${{ steps.version.outputs.version }}.zip" -d frontend
           sed -i 's/\/api\/v1//g' frontend/index.html
-          ./bumpp.sh
+          sed -i "s/\${version}/${{ steps.ghd.outputs.describe }}/g" package.json
+          sed -i "s/\"version\": \".*\"/\"version\": \"${{ steps.ghd.outputs.describe }}\"/" package.json
           npm install -g corepack && corepack enable && pnpm config set store-dir .cache/pnpm
           pnpm install --fetch-timeout 100000
           pnpm dist --linux --windows
diff --git a/desktop/bumpp.sh b/desktop/bumpp.sh
deleted file mode 100755
index fa7efb623..000000000
--- a/desktop/bumpp.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-frontend_version=$(git describe --tags --always --abbrev=10)
-
-sed -i "s/\${version}/$frontend_version/g" package.json
-
-sed -i "s/\"version\": \".*\"/\"version\": \"$frontend_version\"/" package.json