From 60698b9f0a4229c0cf85f1bf5d4c64d6a8fde392 Mon Sep 17 00:00:00 2001
From: netmindz <will@netmindz.net>
Date: Sun, 6 Aug 2023 12:44:27 +0100
Subject: [PATCH 1/3] Update pio.yml

---
 .github/workflows/pio.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pio.yml b/.github/workflows/pio.yml
index 6b6d3115..591f2237 100644
--- a/.github/workflows/pio.yml
+++ b/.github/workflows/pio.yml
@@ -22,13 +22,15 @@ jobs:
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
       - name: Setup Vars
-        run: git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        run: |
+          export git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          export git_branch=${GITHUB_REF#refs/heads/}
       - name: Build PlatformIO Project
         run: pio run
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:
-            name: StarMod-esp32-${git_hash}.bin
+            name: StarMod-esp32-${git_branch}-${git_hash}.bin
             path: .pio/build/esp32dev/firmware.bin
             retention-days: 30
 

From eaba418e38e2fc6adee5b13ca1a7722837daacd8 Mon Sep 17 00:00:00 2001
From: netmindz <will@netmindz.net>
Date: Sun, 6 Aug 2023 12:55:30 +0100
Subject: [PATCH 2/3] Update pio.yml

---
 .github/workflows/pio.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pio.yml b/.github/workflows/pio.yml
index 591f2237..b13e9715 100644
--- a/.github/workflows/pio.yml
+++ b/.github/workflows/pio.yml
@@ -22,15 +22,18 @@ jobs:
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
       - name: Setup Vars
+        id: vars
         run: |
-          export git_hash=$(git rev-parse --short "$GITHUB_SHA")
-          export git_branch=${GITHUB_REF#refs/heads/}
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          git_branch=${GITHUB_REF#refs/heads/}
+          echo "git_hash=${git_hash}" >> $GITHUB_ENV
+          echo "git_branch=${git_branch}" >> $GITHUB_ENV
       - name: Build PlatformIO Project
         run: pio run
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:
-            name: StarMod-esp32-${git_branch}-${git_hash}.bin
+            name: StarMod-esp32-${env.git_branch}-${env.git_hash}.bin
             path: .pio/build/esp32dev/firmware.bin
             retention-days: 30
 

From c2cf1eb3463dd3d24070f5a016d9eaff0f2b53c3 Mon Sep 17 00:00:00 2001
From: netmindz <will@netmindz.net>
Date: Sun, 6 Aug 2023 12:59:42 +0100
Subject: [PATCH 3/3] Update pio.yml

---
 .github/workflows/pio.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pio.yml b/.github/workflows/pio.yml
index b13e9715..ce34e695 100644
--- a/.github/workflows/pio.yml
+++ b/.github/workflows/pio.yml
@@ -33,7 +33,7 @@ jobs:
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:
-            name: StarMod-esp32-${env.git_branch}-${env.git_hash}.bin
+            name: StarMod-esp32-${{env.git_branch}}-${{env.git_hash}}.bin
             path: .pio/build/esp32dev/firmware.bin
             retention-days: 30