From e3acde1ba62d7fce8a39390232801fb0c9779524 Mon Sep 17 00:00:00 2001
From: Florian <florian.hess@azon.ai>
Date: Wed, 14 Aug 2024 20:45:38 +0200
Subject: [PATCH] Move ESPHome project version action

---
 .github/workflows/deploy-pages-dev.yml | 9 ++-------
 .github/workflows/deploy-pages.yml     | 1 -
 .github/workflows/esphome-build.yml    | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy-pages-dev.yml b/.github/workflows/deploy-pages-dev.yml
index e3440c0..dee85af 100644
--- a/.github/workflows/deploy-pages-dev.yml
+++ b/.github/workflows/deploy-pages-dev.yml
@@ -35,17 +35,12 @@ jobs:
 
       - name: Setup Pages
         uses: actions/configure-pages@v4
-        
+
       - name: Extract version from base.yaml
-        id: extract_version
         run: |
           VERSION=$(awk '/project:/, /version:/' firmware/base.yaml | grep 'version:' | awk '{print $2}' | sed 's/[",]//g')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-  
-      - name: Update ESPHome project version
-        run: |
-          sed -i '/^  project:/,/^  platformio_options:/s/^    version: .*/    version: "'"$VERSION"'-dev"/' firmware/base.yaml
-
+          
       - name: Update package.json version
         run: |
           sed -i "s/\"version\": \".*\"/\"version\": \"${VERSION}-dev\"/" package.json
diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
index a11a941..4369a24 100644
--- a/.github/workflows/deploy-pages.yml
+++ b/.github/workflows/deploy-pages.yml
@@ -43,7 +43,6 @@ jobs:
         uses: actions/configure-pages@v4
 
       - name: Extract version from base.yaml
-        id: extract_version
         run: |
           VERSION=$(awk '/project:/, /version:/' firmware/base.yaml | grep 'version:' | awk '{print $2}' | sed 's/[",]//g')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
diff --git a/.github/workflows/esphome-build.yml b/.github/workflows/esphome-build.yml
index 6b55549..74a1f0c 100644
--- a/.github/workflows/esphome-build.yml
+++ b/.github/workflows/esphome-build.yml
@@ -48,6 +48,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
+      - name: Update ESPHome project version
+        if: github.ref != 'refs/heads/master'
+        run: |
+          sed -i '/^  project:/,/^  platformio_options:/s/^    version: .*/    version: "'"$VERSION"'-dev"/' firmware/base.yaml
+
       - uses: esphome/build-action@v4.0.1
         id: esphome-build
         with: