From 6d3ebcf3c231d2e48177e002a2912bb11a8e467e Mon Sep 17 00:00:00 2001
From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:50:27 -0500
Subject: [PATCH] Rename rolling beta release tag to beta-fw (branch/tag
 collision)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The rolling pre-release created a tag named "beta", colliding with the
beta branch. git resolves a bare fetch refspec to refs/tags/ before
refs/heads/, so ESPHome remote packages pinned to ref: beta silently
fetch the tag (which pointed at main's HEAD at creation and never
moves) instead of the branch tip - users following beta as a package
get stale YAML no matter how often they clean caches.

Rename the release tag to beta-fw and update beta_manifest_base to
match. The old beta release/tag should be deleted after this merges
and the renamed release is populated.

Version: 26.7.8.2 (26.7.8.1 is reserved by the open Bluetooth Proxy
PR #90, which will need a rebase over this)

🤖 Generated with [Claude Code](https://claude.com/claude-code)
---
 .github/workflows/build-beta.yml | 14 +++++++-------
 Integrations/ESPHome/Core.yaml   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
index 9266cf6..8ffbdaf 100644
--- a/.github/workflows/build-beta.yml
+++ b/.github/workflows/build-beta.yml
@@ -1,7 +1,7 @@
 name: Build and Publish Beta
 
 # Builds MSR-1 firmware from the beta branch and publishes it as assets on a
-# rolling "beta" pre-release. The on-device "Firmware Channel" select points
+# rolling "beta-fw" pre-release. The on-device "Firmware Channel" select points
 # OTA updates at these assets. Stable firmware is built/published separately
 # by build.yml (push to main -> GitHub Pages).
 
@@ -63,12 +63,12 @@ jobs:
           path: fw
           pattern: firmware*
 
-      - name: Ensure rolling 'beta' pre-release exists
+      - name: Ensure rolling 'beta-fw' pre-release exists
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release view beta -R "${{ github.repository }}" >/dev/null 2>&1 \
-            || gh release create beta -R "${{ github.repository }}" \
+          gh release view beta-fw -R "${{ github.repository }}" >/dev/null 2>&1 \
+            || gh release create beta-fw -R "${{ github.repository }}" \
                  --prerelease --title "Beta (rolling)" \
                  --notes "Latest MSR-1 beta firmware. Auto-updated on every push to the beta branch."
 
@@ -76,7 +76,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          BASE="https://github.com/${{ github.repository }}/releases/download/beta"
+          BASE="https://github.com/${{ github.repository }}/releases/download/beta-fw"
           declare -A DIRS=( [standard]=firmware-standard [ble]=firmware-ble-beta )
           for v in standard ble; do
             src="fw/${DIRS[$v]}"
@@ -98,8 +98,8 @@ jobs:
               | .builds[0].parts |= map(.path = ($base + "/" + $pfx + (.path | sub(".*/"; ""))))
             ' "$man" > "manifest-$v.json"
             cat "manifest-$v.json"
-            gh release upload beta "manifest-$v.json" -R "${{ github.repository }}" --clobber
+            gh release upload beta-fw "manifest-$v.json" -R "${{ github.repository }}" --clobber
             find "$src" -name '*.bin' -print -exec \
-              gh release upload beta {} -R "${{ github.repository }}" --clobber \;
+              gh release upload beta-fw {} -R "${{ github.repository }}" --clobber \;
           done
           echo "Beta assets published."
diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 3b934e9..872ad36 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  version:  "26.7.7.1"
+  version:  "26.7.8.2"
   device_description: ${name} made by Apollo Automation - version ${version}.
   # Default OTA password. Override in your device YAML by re-declaring
   # `substitutions: { ota_password: !secret <name>_ota_password }` so each
@@ -11,7 +11,7 @@ substitutions:
   # Manifest URL bases. Stable = GitHub Pages (main branch builds).
   # Beta = rolling "beta" pre-release assets (beta branch builds).
   stable_manifest_base: "https://apolloautomation.github.io/MSR-1"
-  beta_manifest_base: "https://github.com/ApolloAutomation/MSR-1/releases/download/beta"
+  beta_manifest_base: "https://github.com/ApolloAutomation/MSR-1/releases/download/beta-fw"
 
 esp32:
   variant: esp32c3