From e715d5fd03982ed68521f38a935894432ee57cce Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sun, 26 Oct 2025 04:15:14 +0100 Subject: [PATCH] fix beta release --- .github/workflows/RELEASE_NOTES_GENERATION.md | 8 ++++---- .github/workflows/release.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/RELEASE_NOTES_GENERATION.md b/.github/workflows/RELEASE_NOTES_GENERATION.md index b646f312..b74a2085 100644 --- a/.github/workflows/RELEASE_NOTES_GENERATION.md +++ b/.github/workflows/RELEASE_NOTES_GENERATION.md @@ -36,9 +36,9 @@ The workflow also manually identifies the previous release for context headers u - **Finds**: Latest stable release (no suffix) #### Beta Channel -- **Pattern**: `^[0-9]+\.[0-9]+\.[0-9]+\.b[0-9]+$` (e.g., `2.1.0.b1`, `2.1.0.b2`) +- **Pattern**: `^[0-9]+\.[0-9]+\.[0-9]+b[0-9]+$` (e.g., `2.1.0b1`, `2.1.0b2`) - **Branch**: `dev` -- **Finds**: Latest beta release (`.bN` suffix) +- **Finds**: Latest beta release (`bN` suffix) #### Nightly Channel - **Pattern**: `^[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$` (e.g., `2.1.0.dev20251023`) @@ -75,7 +75,7 @@ The workflow then enhances these notes by: - Include **only commits since the last beta release** - **Do NOT include** nightly commits - **Do NOT include** stable commits from stable branch -- Example: `2.1.0.b2` → `2.1.0.b3` only shows dev branch commits since b2 +- Example: `2.1.0b2` → `2.1.0b3` only shows dev branch commits since b2 #### ✅ Nightly Release Notes - Include **only commits since the last nightly release** @@ -114,7 +114,7 @@ The configuration includes: ```markdown ## 📦 Beta Release -_Changes since [2.1.0.b1](https://github.com/music-assistant/server/releases/tag/2.1.0.b1)_ +_Changes since [2.1.0b1](https://github.com/music-assistant/server/releases/tag/2.1.0b1)_ ### ⚠ Breaking Changes diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 635e87d2..6f22140f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: version: - description: "Version number (e.g., 1.2.3, 1.2.3.b1, or 1.2.3.dev1)" + description: "Version number (e.g., 1.2.3, 1.2.3b1, or 1.2.3.dev1)" required: true type: string channel: @@ -18,7 +18,7 @@ on: workflow_call: inputs: version: - description: "Version number (e.g., 1.2.3, 1.2.3.b1, or 1.2.3.dev1)" + description: "Version number (e.g., 1.2.3, 1.2.3b1, or 1.2.3.dev1)" required: true type: string channel: @@ -73,7 +73,7 @@ jobs: # Regex patterns for each channel STABLE_PATTERN='^[0-9]+\.[0-9]+\.[0-9]+$' - BETA_PATTERN='^[0-9]+\.[0-9]+\.[0-9]+\.b[0-9]+$' + BETA_PATTERN='^[0-9]+\.[0-9]+\.[0-9]+b[0-9]+$' NIGHTLY_PATTERN='^[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$' # Validate version format matches channel @@ -88,7 +88,7 @@ jobs: ;; beta) if ! [[ "$VERSION" =~ $BETA_PATTERN ]]; then - echo "Error: Beta channel requires version format: X.Y.Z.bN (e.g., 1.2.3.b1)" + echo "Error: Beta channel requires version format: X.Y.ZbN (e.g., 1.2.3b1)" exit 1 fi echo "is_prerelease=true" >> $GITHUB_OUTPUT @@ -178,7 +178,7 @@ jobs: PREV_TAG=$(git tag --sort=-version:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | head -n 1) ;; beta) - PREV_TAG=$(git tag --sort=-version:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.b[0-9]+$' | head -n 1) + PREV_TAG=$(git tag --sort=-version:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+b[0-9]+$' | head -n 1) ;; nightly) PREV_TAG=$(git tag --sort=-version:refname | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.dev[0-9]+$' | head -n 1) -- 2.34.1