diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 17d1494..4f002a6 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 # (MTR-1.yaml), not the first-flash Factory image. - - { yaml: Integrations/ESPHome/beta-channel/MTR-1.yaml, name: firmware-standard } - - { yaml: Integrations/ESPHome/beta-channel/MTR-1_BLE.yaml, name: firmware-ble-beta } + - { yaml: Integrations/ESPHome/MTR-1.yaml, name: firmware-standard } + - { yaml: Integrations/ESPHome/MTR-1_BLE.yaml, name: firmware-ble-beta } uses: esphome/workflows/.github/workflows/build.yml@025a1e6255610c498ed590403b7e510b69e474df # 2026.4.1 with: files: ${{ matrix.yaml }} diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml index 6130e3f..163d0fa 100644 --- a/Integrations/ESPHome/Core.yaml +++ b/Integrations/ESPHome/Core.yaml @@ -2,11 +2,6 @@ substitutions: name: apollo-mtr-1 version: "26.8.27.1" device_description: ${name} made by Apollo Automation - version ${version}. - # 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-fw" pre-release assets (beta branch builds). stable_manifest_base: "https://apolloautomation.github.io/MTR-1" @@ -637,7 +632,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/beta-channel/MTR-1.yaml b/Integrations/ESPHome/beta-channel/MTR-1.yaml deleted file mode 100644 index 509f2d9..0000000 --- a/Integrations/ESPHome/beta-channel/MTR-1.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Beta-channel build of MTR-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 MTR-1.yaml directly. -substitutions: - firmware_channel_default: "Beta" - -packages: - base: !include ../MTR-1.yaml diff --git a/Integrations/ESPHome/beta-channel/MTR-1_BLE.yaml b/Integrations/ESPHome/beta-channel/MTR-1_BLE.yaml deleted file mode 100644 index 80ca68a..0000000 --- a/Integrations/ESPHome/beta-channel/MTR-1_BLE.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Beta-channel build of MTR-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 MTR-1_BLE.yaml directly. -substitutions: - firmware_channel_default: "Beta" - -packages: - base: !include ../MTR-1_BLE.yaml