From 323bf7089ab0bb6c9833bcb1f23535e3ab990ea2 Mon Sep 17 00:00:00 2001 From: deluan Date: Fri, 20 Mar 2026 21:32:25 -0400 Subject: [PATCH] ci: update release workflow to use beta versioning instead of prerelease --- .github/workflows/create-release.yml | 15 ++++++++------- Makefile | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 9f438a5..318e776 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -7,11 +7,11 @@ on: description: "Release version (e.g., 1.2.3, without the 'v' prefix)" required: true type: string - prerelease: - description: "Mark this as a pre-release" + beta: + description: "Beta number (1, 2, 3...). Leave empty for stable release" required: false - type: boolean - default: false + type: string + default: "" permissions: contents: write @@ -33,8 +33,9 @@ jobs: - name: Compute full version run: | VERSION="${{ inputs.version }}" - if [[ "${{ inputs.prerelease }}" == "true" ]]; then - VERSION="${VERSION}-prerelease" + BETA="${{ inputs.beta }}" + if [[ -n "$BETA" && "$BETA" != "0" ]]; then + VERSION="${VERSION}-beta-${BETA}" fi echo "VERSION=${VERSION}" >> "$GITHUB_ENV" @@ -83,6 +84,6 @@ jobs: with: tag_name: v${{ env.VERSION }} draft: true - prerelease: ${{ inputs.prerelease }} + prerelease: ${{ inputs.beta != '' && inputs.beta != '0' }} files: discord-rich-presence.ndp generate_release_notes: true diff --git a/Makefile b/Makefile index 3781b0e..8a0cd7b 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ clean: rm -f $(WASM_FILE) $(PLUGIN_NAME).ndp release: - @if [[ ! "${V}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]]; then echo "Usage: make release V=X.X.X [PRE=true]"; exit 1; fi - gh workflow run create-release.yml -f version=${V} -f prerelease=$(if $(filter true,$(PRE)),true,false) - @echo "Release v${V}$(if $(filter true,$(PRE)),-prerelease,) workflow triggered. Check progress: gh run list --workflow=create-release.yml" + @if [[ ! "$${V}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]]; then echo "Usage: make release V=X.X.X [BETA=N]"; exit 1; fi + gh workflow run create-release.yml -f version=$${V} -f beta=$(BETA) + @echo "Release v$${V}$$(if [ -n "$(BETA)" ] && [ "$(BETA)" != "0" ]; then echo -beta-$(BETA); fi) workflow triggered. Check progress: gh run list --workflow=create-release.yml" .PHONY: release