fix: enhance release script to support beta tagging and update branch logic

mstrhakr · mstrhakr · commit 70cd5757d735 · 2026-03-10T14:39:13.000-04:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,10 +5,11 @@
 # - Builds TXZ package using Docker (Slackware)
 # - Calculates MD5 for integrity verification
 # - Creates GitHub releases with package attached
-# - Updates PLG file in dev branch
+# - Updates PLG file in the appropriate branch (main for stable, dev for beta)
 #
 # Triggers:
-# - New tag matching date pattern: vYYYY.MM.DD[a-z]
+# - Stable release: tag like vYYYY.MM.DD or vYYYY.MM.DDa
+# - Beta release: tag like vYYYY.MM.DD-dev
 # - Manual workflow_dispatch for testing builds
 
 name: Build & Release Plugin
@@ -20,7 +21,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Version to build (e.g., 2026.02.01) - leave empty for test build"
+        description: "Version to build (e.g., 2026.02.01 or 2026.02.01-dev) - leave empty for test build"
         required: false
         default: ""
 
@@ -112,10 +113,26 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
 
     steps:
+      - name: Determine release type
+        id: release_type
+        run: |
+          VERSION="${{ needs.build.outputs.version }}"
+          if [[ "$VERSION" == *"-dev"* ]]; then
+            echo "is_beta=true" >> $GITHUB_OUTPUT
+            echo "target_branch=dev" >> $GITHUB_OUTPUT
+            echo "prerelease=true" >> $GITHUB_OUTPUT
+            echo "Release type: BETA (dev branch)"
+          else
+            echo "is_beta=false" >> $GITHUB_OUTPUT
+            echo "target_branch=main" >> $GITHUB_OUTPUT
+            echo "prerelease=false" >> $GITHUB_OUTPUT
+            echo "Release type: STABLE (main branch)"
+          fi
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: ${{ steps.release_type.outputs.target_branch }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download artifacts
@@ -128,6 +145,8 @@ jobs:
         id: notes
         run: |
           VERSION="${{ needs.build.outputs.version }}"
+          TARGET_BRANCH="${{ steps.release_type.outputs.target_branch }}"
+          IS_BETA="${{ steps.release_type.outputs.is_beta }}"
 
           # Read component versions from release_info
           if [[ -f artifacts/release_info ]]; then
@@ -136,15 +155,26 @@ jobs:
             COMPONENTS="Compose v${{ env.COMPOSE_VERSION }}"
           fi
 
+          # Set release title based on type
+          if [[ "$IS_BETA" == "true" ]]; then
+            TITLE="Compose Manager v${VERSION} (Beta)"
+            INSTALL_NOTE="**Beta Release** - Install from the beta channel for testing."
+          else
+            TITLE="Compose Manager v${VERSION}"
+            INSTALL_NOTE=""
+          fi
+
           # Create release body
           cat > release_body.md << EOF
-          ## Compose Manager v${VERSION}
+          ## ${TITLE}
+
+          ${INSTALL_NOTE}
 
           ### Installation
 
           **Via Plugin Manager:**
           \`\`\`
-          https://raw.githubusercontent.com/${{ github.repository }}/main/${{ env.PLUGIN_NAME }}.plg
+          https://raw.githubusercontent.com/${{ github.repository }}/${TARGET_BRANCH}/${{ env.PLUGIN_NAME }}.plg
           \`\`\`
 
           ### Package Details
@@ -157,20 +187,21 @@ jobs:
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
-          name: "Compose Manager v${{ needs.build.outputs.version }}"
+          name: "Compose Manager v${{ needs.build.outputs.version }}${{ steps.release_type.outputs.is_beta == 'true' && ' (Beta)' || '' }}"
           body_path: release_body.md
           files: |
             artifacts/*.txz
           fail_on_unmatched_files: true
           draft: false
-          prerelease: false
+          prerelease: ${{ steps.release_type.outputs.prerelease == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Update PLG in main branch
+      - name: Update PLG in target branch
         run: |
           VERSION="${{ needs.build.outputs.version }}"
           MD5="${{ needs.build.outputs.md5 }}"
+          TARGET_BRANCH="${{ steps.release_type.outputs.target_branch }}"
 
           # Configure git
           git config user.name "github-actions[bot]"
@@ -188,4 +219,4 @@ jobs:
           # Commit and push
           git add ${{ env.PLUGIN_NAME }}.plg
           git commit -m "Release v${VERSION}" || echo "No changes to commit"
-          git push origin main
+          git push origin ${TARGET_BRANCH}
diff --git a/release.ps1 b/release.ps1
@@ -7,23 +7,29 @@
     This script creates and pushes a version tag which triggers GitHub Actions
     to build the package and create a release. Uses date-based versioning (YYYY.MM.DD).
     
-    Multiple releases on the same day get suffixes: v2026.02.01, v2026.02.01a, v2026.02.01b
+    Stable releases: v2026.02.01, v2026.02.01a, v2026.02.01b
+    Beta releases:   v2026.02.01-dev (use -Beta flag)
     
     Automatically generates release notes from git commits and updates the PLG file.
 
+.PARAMETER Beta
+    Create a beta/dev release (adds -dev suffix, marks as prerelease on GitHub).
+
 .PARAMETER DryRun
     Show what would be done without making any changes.
 
 .PARAMETER Force
     Skip all confirmation prompts.
 
 .EXAMPLE
-    ./release.ps1           # Creates v2026.02.01 (or next available)
+    ./release.ps1           # Creates v2026.02.01 (stable)
+    ./release.ps1 -Beta     # Creates v2026.02.01-dev (beta)
     ./release.ps1 -DryRun   # Preview without changes
     ./release.ps1 -Force    # Skip confirmations
 #>
 
 param(
+    [switch]$Beta,
     [switch]$DryRun,
     [switch]$Force
 )
@@ -34,47 +40,62 @@ $PlgFile = "compose.manager.plg"
 
 Write-Host ""
 Write-Host "========================================" -ForegroundColor Cyan
-Write-Host "  Compose Manager Release Script" -ForegroundColor Cyan
+if ($Beta) {
+    Write-Host "  Compose Manager BETA Release" -ForegroundColor Yellow
+} else {
+    Write-Host "  Compose Manager Release Script" -ForegroundColor Cyan
+}
 Write-Host "========================================" -ForegroundColor Cyan
 Write-Host ""
 
 # Get today's date in version format
 $dateVersion = Get-Date -Format "yyyy.MM.dd"
-$baseTag = "v$dateVersion"
-
-# Fetch latest tags from remote
-Write-Host "Fetching latest from origin..." -ForegroundColor Yellow
-git fetch origin --tags
 
-# Get existing tags for today
-$existingTags = git tag -l "$baseTag*" 2>$null | Sort-Object
-
-if ($existingTags) {
-    Write-Host "Existing tags for today:" -ForegroundColor Yellow
-    $existingTags | ForEach-Object { Write-Host "  $_" -ForegroundColor Gray }
+if ($Beta) {
+    # Beta releases use -dev.HHMM suffix for uniqueness
+    $timeStamp = Get-Date -Format "HHmm"
+    $newTag = "v$dateVersion-dev.$timeStamp"
+    
+    # No collision check needed - time-based tags are unique
+    git fetch origin --tags
+} else {
+    # Stable release logic
+    $baseTag = "v$dateVersion"
+    
+    # Fetch latest tags from remote
+    Write-Host "Fetching latest from origin..." -ForegroundColor Yellow
+    git fetch origin --tags
     
-    # Find the next suffix
-    $lastTag = $existingTags | Select-Object -Last 1
+    # Get existing tags for today (exclude -dev tags)
+    $existingTags = git tag -l "$baseTag*" 2>$null | Where-Object { $_ -notmatch '-dev' } | Sort-Object
     
-    if ($lastTag -eq $baseTag) {
-        # First release was without suffix, next is 'a'
-        $newTag = "${baseTag}a"
-    } elseif ($lastTag -match "^v\d{4}\.\d{2}\.\d{2}([a-z])$") {
-        # Increment the suffix letter
-        $lastSuffix = $matches[1]
-        $nextSuffix = [char]([int][char]$lastSuffix + 1)
-        if ($nextSuffix -gt 'z') {
-            Write-Error "Too many releases today! (exceeded 'z' suffix)"
+    if ($existingTags) {
+        Write-Host "Existing tags for today:" -ForegroundColor Yellow
+        $existingTags | ForEach-Object { Write-Host "  $_" -ForegroundColor Gray }
+        
+        # Find the next suffix
+        $lastTag = $existingTags | Select-Object -Last 1
+        
+        if ($lastTag -eq $baseTag) {
+            # First release was without suffix, next is 'a'
+            $newTag = "${baseTag}a"
+        } elseif ($lastTag -match "^v\d{4}\.\d{2}\.\d{2}([a-z])$") {
+            # Increment the suffix letter
+            $lastSuffix = $matches[1]
+            $nextSuffix = [char]([int][char]$lastSuffix + 1)
+            if ($nextSuffix -gt 'z') {
+                Write-Error "Too many releases today! (exceeded 'z' suffix)"
+                exit 1
+            }
+            $newTag = "$baseTag$nextSuffix"
+        } else {
+            Write-Error "Unexpected tag format: $lastTag"
             exit 1
         }
-        $newTag = "$baseTag$nextSuffix"
     } else {
-        Write-Error "Unexpected tag format: $lastTag"
-        exit 1
+        # No releases today yet - use base tag without suffix
+        $newTag = $baseTag
     }
-} else {
-    # No releases today yet - use base tag without suffix
-    $newTag = $baseTag
 }
 
 # Get the last tag for generating changelog
@@ -83,7 +104,13 @@ $versionNumber = $newTag -replace '^v', ''
 
 Write-Host ""
 Write-Host "New release tag: " -NoNewline
-Write-Host $newTag -ForegroundColor Green
+if ($Beta) {
+    Write-Host $newTag -ForegroundColor Yellow
+    Write-Host "  Type: BETA (will update dev branch)" -ForegroundColor Yellow
+} else {
+    Write-Host $newTag -ForegroundColor Green
+    Write-Host "  Type: STABLE (will update main branch)" -ForegroundColor Green
+}
 Write-Host ""
 
 # Generate release notes from git commits
