Skip to content

Fix double beta release and wrong release channel detection #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanderBot merged 1 commit into from
Feb 22, 2026
Merged

Fix double beta release and wrong release channel detection #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/nightly-beta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
Expand Down
6 changes: 5 additions & 1 deletion generate_changelog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down