From 502c4e7b0d4050d5bef882fe5eeb20e4f264ee12 Mon Sep 17 00:00:00 2001 From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com> Date: Thu, 9 Jul 2026 15:47:00 -0500 Subject: [PATCH] Remove vestigial ble_firmware substitution; fix build.yml device-name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ble_firmware substitution is no longer read by anything after the runtime Bluetooth Proxy switch replaced the firmware_ble manifest selector (#100) - remove it from Core.yaml and MSR-1_BLE.yaml. Also correct the copy-pasted device-name input in build.yml (msr-2 -> msr-1); it is a required-but-unused input in the shared workflow, so this is a no-op correctness fix. No compiled-output change; does not publish. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- .github/workflows/build.yml | 2 +- Integrations/ESPHome/Core.yaml | 4 ---- Integrations/ESPHome/MSR-1_BLE.yaml | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e95847..637ab4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: id-token: write pull-requests: write with: - device-name: msr-2 + device-name: msr-1 # MSR-1.yaml is the end-user image served at firmware/ (OTA updates). The Factory image (improv + # factory test) is only used for first flashes via the web installer. yaml-files: | diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index b274a24..e57d891 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -5,10 +5,6 @@ substitutions: # `substitutions: { ota_password: !secret _ota_password }` so each # device on your network uses a unique secret instead of the shared default. ota_password: "apolloautomation" - # Firmware variant identity: overridden to "true" by MSR-1_BLE.yaml. Seeds - # the Bluetooth Proxy select on boot so it self-corrects to what is - # actually running after a failed or abandoned switch. - ble_firmware: "false" # Default update channel on first boot (no stored user choice yet, i.e. a # fresh flash). The beta-channel builds override this to "Beta" (see # Integrations/ESPHome/beta-channel/) so firmware obtained from the beta diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml index c026398..7e66e0a 100644 --- a/Integrations/ESPHome/MSR-1_BLE.yaml +++ b/Integrations/ESPHome/MSR-1_BLE.yaml @@ -1,5 +1,4 @@ substitutions: - ble_firmware: "true" # Legacy BLE devices keep updating from the firmware-ble manifest. ota_stable_manifest: "https://apolloautomation.github.io/MSR-1/firmware-ble/manifest.json" ota_beta_manifest: "https://github.com/ApolloAutomation/MSR-1/releases/download/beta-fw/manifest-ble.json"