From e6345d857cbaa11f4c83f22b46eeb9f8b38d127e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20B=C3=B6ttcher?= <colin.boettcher@gmail.com>
Date: Fri, 20 Feb 2026 15:08:12 +0100
Subject: [PATCH] Fix double beta release and wrong release channel detection

---
 .github/workflows/nightly-beta.yml | 2 --
 .github/workflows/release.yml      | 5 +++++
 generate_changelog.sh              | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nightly-beta.yml b/.github/workflows/nightly-beta.yml
index 4861133f0..8ae772fb8 100644
--- a/.github/workflows/nightly-beta.yml
+++ b/.github/workflows/nightly-beta.yml
@@ -48,8 +48,6 @@ jobs:
             if gh api "repos/${{ github.repository }}/git/refs" \
                  -f ref="refs/tags/${TAG}" -f sha="${SHA}" 2>/dev/null; then
               echo "Created tag: ${TAG}"
-              gh workflow run release.yml -f "tag=${TAG}"
-              echo "Triggered release build"
               exit 0
             fi
           done
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0fce63c71..46ec927c5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,6 +50,11 @@ jobs:
           if [[ "$GITHUB_REF" == refs/heads/* ]] && [[ -z "${{ inputs.tag }}" ]]; then
             export FORCE_ALPHA=true
           fi
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            export OVERRIDE_TAG="${GITHUB_REF#refs/tags/}"
+          elif [[ -n "${{ inputs.tag }}" ]]; then
+            export OVERRIDE_TAG="${{ inputs.tag }}"
+          fi
           ./generate_changelog.sh
 
           VERSION=$(grep 'DF.ADDON_VERSION' Changelog.lua | sed 's/.*= "\(.*\)"/\1/')
diff --git a/generate_changelog.sh b/generate_changelog.sh
index 037640d36..7b079089b 100755
--- a/generate_changelog.sh
+++ b/generate_changelog.sh
@@ -41,7 +41,11 @@ trim_to_first_section() {
 # ============================================================
 # DETERMINE VERSION AND CHANGELOG CONTENT
 # ============================================================
-CURRENT_TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
+if [ -n "${OVERRIDE_TAG:-}" ]; then
+    CURRENT_TAG="$OVERRIDE_TAG"
+else
+    CURRENT_TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
+fi
 LAST_TAG=$(git describe --tags --abbrev=0 HEAD 2>/dev/null || echo "v0.0.0")
 
 # Branch pushes must always produce alpha builds, even if a tag exists on HEAD