diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 4a8d35c..51e7acd 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -41,8 +41,8 @@ jobs: include: # Beta serves OTA updates only, so it builds the end-user image # (MSR-1.yaml), not the first-flash Factory image. - - { yaml: Integrations/ESPHome/beta-channel/MSR-1.yaml, name: firmware-standard } - - { yaml: Integrations/ESPHome/beta-channel/MSR-1_BLE.yaml, name: firmware-ble-beta } + - { yaml: Integrations/ESPHome/MSR-1.yaml, name: firmware-standard } + - { yaml: Integrations/ESPHome/MSR-1_BLE.yaml, name: firmware-ble-beta } uses: esphome/workflows/.github/workflows/build.yml@9f6577fd37b5cf773ab1b9be929714a0dcd15661 # 2026.7.0 with: files: ${{ matrix.yaml }} @@ -103,3 +103,14 @@ jobs: gh release upload beta-fw {} -R "${{ github.repository }}" --clobber \; done echo "Beta assets published." + + - name: Point beta-fw tag at the built commit + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + # gh release create tags default-branch HEAD, and uploads never move + # the tag, so without this the release's source commit drifts away + # from the assets actually published. + gh api -X PATCH "repos/${{ github.repository }}/git/refs/tags/beta-fw" \ + -f sha="${{ github.sha }}" -F force=true + echo "beta-fw -> ${{ github.sha }}" diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 5b5cfc1..8e7ad44 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -1,15 +1,10 @@ substitutions: - version: "26.7.9.1" + version: "26.8.19.1" device_description: ${name} made by Apollo Automation - version ${version}. # Default OTA password. Override in your device YAML by re-declaring # `substitutions: { ota_password: !secret _ota_password }` so each # device on your network uses a unique secret instead of the shared default. ota_password: "apolloautomation" - # 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 - # channel keeps tracking it instead of offering a stable "downgrade". - firmware_channel_default: "Stable" # 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" @@ -20,6 +15,12 @@ substitutions: ota_stable_manifest: "${stable_manifest_base}/firmware/manifest.json" ota_beta_manifest: "${beta_manifest_base}/manifest-standard.json" + # Bluetooth Proxy switch state on a device with no stored preference yet + # (first boot after this switch was added, or after a factory reset). The + # unified image ships the proxy off; MSR-1_BLE.yaml overrides this to ON so + # legacy BLE devices keep proxying instead of going quiet after an update. + bluetooth_proxy_restore_mode: RESTORE_DEFAULT_OFF + esphome: # List form so package merging concatenates with each variant's own on_boot # entries (mapping form would be replaced by the variant's block instead). @@ -28,7 +29,7 @@ esphome: then: - script.execute: apply_ota_source # Re-apply the Bluetooth Proxy switch after all components set up, so BLE - # scanning matches the persisted switch (proxy stays off by default). + # scanning matches the switch state restored from flash. - priority: -300 then: - if: @@ -755,7 +756,7 @@ switch: id: bluetooth_proxy_switch icon: mdi:bluetooth entity_category: "config" - restore_mode: RESTORE_DEFAULT_OFF + restore_mode: ${bluetooth_proxy_restore_mode} optimistic: true on_turn_on: - esp32_ble_tracker.start_scan: @@ -798,7 +799,7 @@ select: options: - "Stable" - "Beta" - initial_option: "${firmware_channel_default}" + initial_option: "Stable" on_value: then: - script.execute: apply_ota_source diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml index 8c1b573..97ea4f6 100644 --- a/Integrations/ESPHome/MSR-1_BLE.yaml +++ b/Integrations/ESPHome/MSR-1_BLE.yaml @@ -3,6 +3,10 @@ substitutions: 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" + # Legacy BLE devices proxied unconditionally before the Bluetooth Proxy + # switch existed, so default it on rather than dropping the proxy on update. + bluetooth_proxy_restore_mode: RESTORE_DEFAULT_ON + esphome: name: apollo-msr-1 friendly_name: Apollo Multisensor Mk1 (MSR-1) diff --git a/Integrations/ESPHome/beta-channel/MSR-1.yaml b/Integrations/ESPHome/beta-channel/MSR-1.yaml deleted file mode 100644 index 63b5067..0000000 --- a/Integrations/ESPHome/beta-channel/MSR-1.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Beta-channel build of MSR-1.yaml: the identical image except the Firmware -# Channel select defaults to "Beta" on first boot, so firmware obtained from -# the beta channel keeps tracking it. Built by build-beta.yml only; the -# stable (GitHub Pages) builds use MSR-1.yaml directly. -substitutions: - firmware_channel_default: "Beta" - -packages: - base: !include ../MSR-1.yaml diff --git a/Integrations/ESPHome/beta-channel/MSR-1_BLE.yaml b/Integrations/ESPHome/beta-channel/MSR-1_BLE.yaml deleted file mode 100644 index 1316fa6..0000000 --- a/Integrations/ESPHome/beta-channel/MSR-1_BLE.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Beta-channel build of MSR-1_BLE.yaml: the identical image except the Firmware -# Channel select defaults to "Beta" on first boot, so firmware obtained from -# the beta channel keeps tracking it. Built by build-beta.yml only; the -# stable (GitHub Pages) builds use MSR-1_BLE.yaml directly. -substitutions: - firmware_channel_default: "Beta" - -packages: - base: !include ../MSR-1_BLE.yaml