From 289f2c875c0773a9a2e62cea3cb004dd58b1941e Mon Sep 17 00:00:00 2001
From: Klaas Schoute <hello@student-techlife.com>
Date: Fri, 6 Sep 2024 15:49:31 +0200
Subject: [PATCH 1/2] Fix firmware path in manifest (#585)

* Fix alternating the firmware path in manifest

* Add default release summary text

* Adjust sed command

* Test with new sed command

* Try again
---
 .github/workflows/build-firmware.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index 2bee1dcb..8025437a 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -105,6 +105,7 @@ jobs:
         with:
           yaml-file: ${{ matrix.firmware }}/${{ matrix.device }}.yaml
           version: ${{ matrix.version || 'latest' }}
+          release-summary: "Check the release notes for more information."
           release-url: ${{ inputs.release-url || env.RELEASE_URL }}
           cache: true
       - name: 🚚 Move generated files to output
@@ -115,7 +116,8 @@ jobs:
           echo ${{ steps.esphome-build.outputs.project-version }} > output/${{ matrix.device }}/project_version
       - name: 🔨 Alter path in manifest.json
         run: |
-          sed -i 's/${{ steps.esphome-build.outputs.name }}\//\/${{ matrix.firmware }}\/${{ matrix.device }}\//g' output/${{ matrix.device }}/manifest.json
+          sed -i 's/${{ steps.esphome-build.outputs.name }}\(\.[a-z]*\)\.bin/\/${{ matrix.firmware }}\/${{ matrix.device }}\/${{ steps.esphome-build.outputs.name }}\1.bin/' output/${{ matrix.device }}/manifest.json
+          cat output/${{ matrix.device }}/manifest.json
       - name: ⬆️ Upload firmware / device artifact
         uses: actions/upload-artifact@v4.4.0
         with:

From b79fc70114b0c2a70ba48ab484c2b7bc2fc250ab Mon Sep 17 00:00:00 2001
From: Klaas Schoute <hello@student-techlife.com>
Date: Fri, 6 Sep 2024 15:58:12 +0200
Subject: [PATCH 2/2] Bump Home Assistant Glow to v4.2.1

---
 home-assistant-glow/esp32.yaml   | 4 ++--
 home-assistant-glow/esp8266.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/home-assistant-glow/esp32.yaml b/home-assistant-glow/esp32.yaml
index 38150d70..78114a03 100644
--- a/home-assistant-glow/esp32.yaml
+++ b/home-assistant-glow/esp32.yaml
@@ -8,7 +8,7 @@
 substitutions:
   device_name: home-assistant-glow
   friendly_name: Home Assistant Glow
-  project_version: "4.2.0"
+  project_version: "4.2.1"
   device_description: "Measure your energy consumption with the pulse LED on your smart meter - ESP32 Generic"
 
   # Define the GPIO pins
@@ -37,7 +37,7 @@ esp32:
 packages:
   remote_package:
     url: https://github.com/klaasnicolaas/home-assistant-glow/
-    ref: "4.2.0"
+    ref: "4.2.1"
     files:
       - components/basis.yaml
       - components/updates.yaml
diff --git a/home-assistant-glow/esp8266.yaml b/home-assistant-glow/esp8266.yaml
index 1aa70635..6d96f964 100644
--- a/home-assistant-glow/esp8266.yaml
+++ b/home-assistant-glow/esp8266.yaml
@@ -8,7 +8,7 @@
 substitutions:
   device_name: home-assistant-glow
   friendly_name: Home Assistant Glow
-  project_version: "4.2.0"
+  project_version: "4.2.1"
   device_description: "Measure your energy consumption with the pulse LED on your smart meter - ESP8266 Generic"
 
   # Define the GPIO pins
@@ -35,7 +35,7 @@ esp8266:
 packages:
   remote_package:
     url: https://github.com/klaasnicolaas/home-assistant-glow/
-    ref: "4.2.0"
+    ref: "4.2.1"
     files:
       - components/basis.yaml
       - components/updates.yaml