Move ESPHome project version action

AzonInc · Aug 14, 2024 · e3acde1 · e3acde1
1 parent 185207e
commit e3acde1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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: