From 91ae7f89ecd324aa375b7457483f430a9f2bb0b0 Mon Sep 17 00:00:00 2001 From: huizebruin <62996429+huizebruin@users.noreply.github.com> Date: Fri, 28 Jun 2024 23:46:32 +0200 Subject: [PATCH 1/2] fix for project version * fix for project version Co-Authored-By: Klaas Schoute --- .github/release-drafter.yml | 4 ++-- esphome/components/basis.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index be3351c..93a99c0 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,6 +1,6 @@ --- name-template: "v$RESOLVED_VERSION" -tag-template: "v$RESOLVED_VERSION" +tag-template: "$RESOLVED_VERSION" change-template: "- #$NUMBER $TITLE @$AUTHOR" sort-direction: ascending @@ -60,4 +60,4 @@ template: | $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION \ No newline at end of file + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION \ No newline at end of file diff --git a/esphome/components/basis.yaml b/esphome/components/basis.yaml index cad798f..c423c4d 100644 --- a/esphome/components/basis.yaml +++ b/esphome/components/basis.yaml @@ -4,8 +4,8 @@ # Source File: https://github.com/huizebruin/s0tool/tree/main/esphome # © https://huizebruin.nl & https://s0tool.nl substitutions: - device_description: ${name} made by s0tool.nl project version ${vdate}. - vdate: "v3.6.1" # From 23-06-2024 new version + device_description: ${name} made by s0tool.nl project version ${project_version}. + project_version: "3.6.1" # From 23-06-2024 new version date: "24-06-2024" preferences: @@ -78,7 +78,7 @@ text_sensor: update_interval: 6h entity_category: diagnostic lambda: |- - return {"${vdate}"}; + return {"${project_version}"}; - platform: wifi_info ip_address: From 661a4dbe264248c1073e25ab6482c807ecfa7824 Mon Sep 17 00:00:00 2001 From: huizebruin <62996429+huizebruin@users.noreply.github.com> Date: Fri, 28 Jun 2024 23:47:14 +0200 Subject: [PATCH 2/2] Update build.yml Co-Authored-By: Klaas Schoute --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7ecfa8..8179ccc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: run: | mkdir output mv ${{ steps.esphome-build.outputs.name }} output/ - jq -s '{"name": "${{ matrix.firmware.name }}", "version": "v3.6.1", "home_assistant_domain": "esphome", "new_install_prompt_erase": false, "builds":.}' output/${{ steps.esphome-build.outputs.name }}/manifest.json > output/${{ matrix.firmware.manifest_filename }} + jq -s '{"name": "${{ matrix.firmware.name }}", "version": "3.6.1", "home_assistant_domain": "esphome", "new_install_prompt_erase": false, "builds":.}' output/${{ steps.esphome-build.outputs.name }}/manifest.json > output/${{ matrix.firmware.manifest_filename }} - name: Upload artifact uses: actions/upload-artifact@v4.3.3