Use project.version for combine manifest build (#524)

klaasnicolaas · Jul 4, 2024 · 288b6b8 · 288b6b8
1 parent 6427e44
commit 288b6b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
@@ -112,6 +112,7 @@ jobs:
           mkdir -p output/${{ matrix.device }}
           mv ${{ steps.esphome-build.outputs.name }}/* output/${{ matrix.device }}/
           echo ${{ steps.esphome-build.outputs.version }} > output/${{ matrix.device }}/version
+          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

diff --git a/.github/workflows/deploy-firmware.yaml b/.github/workflows/deploy-firmware.yaml
@@ -8,11 +8,6 @@ on:
       - published
   workflow_dispatch:
     inputs:
-      release-tag:
-        description: "Release tag"
-        default: "x.x.x"
-        required: true
-        type: string
       release-url:
         description: "Release URL"
         default: "https://github.com"
@@ -45,7 +40,7 @@ jobs:
           path: files
       - name: 🔨 Generate device manifest.json
         run: |
-          version=${{ github.event.release.tag_name || inputs.release-tag }}
+          version=cat(project_version)
           jq -s --arg version "$version" '{"name": "${{ matrix.name }}", "version": $version, "home_assistant_domain": "esphome", "builds":.}' files/*/manifest.json > files/manifest.json
       - name: 🧪 Display structure of job
         run: ls -R