diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 15d30ad..436184d 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -2,6 +2,7 @@ name-template: 'Release v$NEXT_PATCH_VERSION' tag-template: "$RESOLVED_VERSION" change-template: "- #$NUMBER $TITLE @$AUTHOR" sort-direction: ascending +category-template: '**$TITLE**' categories: - title: "🚨 Breaking changes" @@ -25,11 +26,9 @@ include-labels: no-changes-template: '- No changes' +# The shared build workflow appends a Full Changelog compare link to the +# release body (release-drafter cannot render 4-part version tags). template: | - ## What's Changed + **What's Changed** $CHANGES - - **Full Changelog**: https://github.com/ApolloAutomation/MSR-1/compare/$PREVIOUS_TAG...$RESOLVED_VERSION.1 - - Be sure to 🌟 this repository for updates! \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 657c95a..cebfa8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,8 @@ jobs: device-name: msr-2 yaml-files: | Integrations/ESPHome/MSR-1_Factory.yaml - firmware-names: "1_Factory:firmware" + Integrations/ESPHome/MSR-1_BLE.yaml + firmware-names: "1_Factory:firmware,1_BLE:firmware-ble" core-yaml-path: Integrations/ESPHome/Core.yaml esphome-version: stable # Bypass check if manually triggered with bypass option diff --git a/Integrations/ESPHome/MSR-1.yaml b/Integrations/ESPHome/MSR-1.yaml index 72245d3..0b83d1f 100644 --- a/Integrations/ESPHome/MSR-1.yaml +++ b/Integrations/ESPHome/MSR-1.yaml @@ -18,7 +18,7 @@ esphome: name: "ApolloAutomation.MSR-1" version: "${version}" - min_version: 2025.2.0 + min_version: 2025.11.0 dashboard_import: package_import_url: github://ApolloAutomation/MSR-1/Integrations/ESPHome/MSR-1.yaml @@ -29,8 +29,12 @@ logger: ota: - platform: esphome password: ${ota_password} + - platform: http_request + id: ota_managed wifi: + on_connect: + - component.update: update_http_request power_save_mode: none ap: ssid: "Apollo MSR1 Hotspot" @@ -41,5 +45,16 @@ web_server: port: 80 version: 3 +http_request: + verify_ssl: true + +safe_mode: + +update: + - platform: http_request + id: update_http_request + name: Firmware Update + source: https://apolloautomation.github.io/MSR-1/firmware/manifest.json + packages: core: !include Core.yaml \ No newline at end of file diff --git a/Integrations/ESPHome/MSR-1_BLE.yaml b/Integrations/ESPHome/MSR-1_BLE.yaml index a6cf842..92f7f96 100644 --- a/Integrations/ESPHome/MSR-1_BLE.yaml +++ b/Integrations/ESPHome/MSR-1_BLE.yaml @@ -18,7 +18,7 @@ esphome: name: "ApolloAutomation.MSR-1_BLE" version: "${version}" - min_version: 2025.2.0 + min_version: 2025.11.0 logger: @@ -30,13 +30,28 @@ dashboard_import: ota: - platform: esphome password: ${ota_password} + - platform: http_request + id: ota_managed wifi: + on_connect: + - component.update: update_http_request ap: ssid: "Apollo MSR1 Hotspot" bluetooth_proxy: active: true +http_request: + verify_ssl: true + +safe_mode: + +update: + - platform: http_request + id: update_http_request + name: Firmware Update + source: https://apolloautomation.github.io/MSR-1/firmware-ble/manifest.json + packages: core: !include Core.yaml \ No newline at end of file diff --git a/Integrations/ESPHome/MSR-1_Factory.yaml b/Integrations/ESPHome/MSR-1_Factory.yaml index ecc54f9..0b14b27 100644 --- a/Integrations/ESPHome/MSR-1_Factory.yaml +++ b/Integrations/ESPHome/MSR-1_Factory.yaml @@ -18,7 +18,7 @@ esphome: name: "ApolloAutomation.MSR-1_Factory" version: "${version}" - min_version: 2025.2.0 + min_version: 2025.11.0 dashboard_import: package_import_url: github://ApolloAutomation/MSR-1/Integrations/ESPHome/MSR-1.yaml @@ -30,6 +30,8 @@ esp32_improv: authorizer: none wifi: + on_connect: + - component.update: update_http_request ap: ssid: "Apollo MSR1 Hotspot" @@ -38,6 +40,19 @@ logger: ota: - platform: esphome id: ota_esphome + - platform: http_request + id: ota_managed + +http_request: + verify_ssl: true + +safe_mode: + +update: + - platform: http_request + id: update_http_request + name: Firmware Update + source: https://apolloautomation.github.io/MSR-1/firmware/manifest.json packages: core: !include Core.yaml \ No newline at end of file