From 18288bc44f976057a769c552ed4e9b54c7d58c60 Mon Sep 17 00:00:00 2001
From: sarayourfriend <24264157+sarayourfriend@users.noreply.github.com>
Date: Tue, 13 Feb 2024 09:53:02 +1100
Subject: [PATCH] Fix release tag formatting (#3788)

---
 .github/workflows/draft_releases.yml | 6 +++---
 .github/workflows/release-app.yml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/draft_releases.yml b/.github/workflows/draft_releases.yml
index 2061c6e230f..ed1c60707dc 100644
--- a/.github/workflows/draft_releases.yml
+++ b/.github/workflows/draft_releases.yml
@@ -38,7 +38,7 @@ jobs:
 
           {
             echo "date=$formatted_date";
-            echo "git-tag=${{ env.APP_NAME }}-$formatted_date";
+            echo "git-tag=${{ matrix.app }}-$formatted_date";
           } >> "$GITHUB_OUTPUT"
 
       # Each time this runs, it should replace the previous drafted release matching the tag prefix set in the release drafter config
@@ -49,8 +49,8 @@ jobs:
         with:
           config-name: release-drafter-${{ matrix.app }}.yml
           version: ${{ steps.tag.outputs.date }}
-          tag: ${{ matrix.app }}-${{ steps.tag.outputs.git-tag }}
-          name: ${{ matrix.app }}-${{ steps.tag.outputs.git-tag }}
+          tag: ${{ steps.tag.outputs.git-tag }}
+          name: ${{ steps.tag.outputs.git-tag }}
           draft: true
           commitish: main
         env:
diff --git a/.github/workflows/release-app.yml b/.github/workflows/release-app.yml
index b08c54a5a11..e2cbd82c305 100644
--- a/.github/workflows/release-app.yml
+++ b/.github/workflows/release-app.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Calculate tag name
         id: tag
         run: |
-          release_date=$(echo '${{ github.ref_name }}' | sed 's/${{ env.APP_NAME }}//')
+          release_date=$(echo '${{ github.ref_name }}' | sed 's/${{ env.APP_NAME }}-//')
 
           # Generate `rel-` prefixed image tag to avoid duplicated app name between image and tag
           {