Update relase CI

rtlopez · Jul 16, 2023 · 9576a0b · 9576a0b
1 parent 4877024
commit 9576a0b
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/.github/workflows/platformio.yml b/.github/workflows/platformio.yml
@@ -90,11 +90,19 @@ jobs:
         env:
           PLATFORMIO_BUILD_FLAGS: -DESPFC_REVISION=${{ env.build_sha }}
 
-      - name: Merge Development Target
-        if: ${{ !startsWith(github.ref, 'refs/tags/') && startsWith(matrix.target, 'esp32') }}
+      - name: Build Release Target
+        if: "startsWith(github.ref, 'refs/tags/')"
+        run: |
+          platformio run -e ${{ matrix.target }}
+        env:
+          PLATFORMIO_BUILD_FLAGS: -DESPFC_REVISION=${{ env.build_sha }} -DESPFC_VERSION=${{ env.build_tag }}
+
+      - name: Merge ESP32 Target
+        if: ${{ startsWith(matrix.target, 'esp32') }}
         run: |
           python3 ~/.platformio/packages/tool-esptoolpy/esptool.py --chip ${{ matrix.target }} merge_bin -o .pio/build/${{ matrix.target }}/firmware_merged.bin --target-offset 0x0 --flash_mode keep --flash_freq keep --flash_size 4MB 0x1000 .pio/build/${{ matrix.target }}/bootloader.bin 0x8000 .pio/build/${{ matrix.target }}/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/${{ matrix.target }}/firmware.bin
 
+
       - name: Create Development Artifact
         uses: actions/upload-artifact@v3
         if: ${{ !startsWith(github.ref, 'refs/tags/') }}
@@ -110,16 +118,16 @@ jobs:
           path: .pio/build/${{ matrix.target }}/firmware_merged.bin
 
 
-      - name: Run Release Build
-        if: "startsWith(github.ref, 'refs/tags/')"
-        run: |
-          platformio run -e ${{ matrix.target }}
-        env:
-          PLATFORMIO_BUILD_FLAGS: -DESPFC_REVISION=${{ env.build_sha }} -DESPFC_VERSION=${{ env.build_tag }}
-
       - name: Create Release Artifact
         uses: actions/upload-artifact@v3
-        if: "startsWith(github.ref, 'refs/tags/')"
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         with:
           name: ${{ env.build_file_release }}.bin
           path: .pio/build/${{ matrix.target }}/firmware.bin
+
+      - name: Create Release Artifact Merged
+        uses: actions/upload-artifact@v3
+        if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(matrix.target, 'esp32') }}
+        with:
+          name: ${{ env.build_file_release }}_0x00.bin
+          path: .pio/build/${{ matrix.target }}/firmware_merged.bin