New release2.yml V2 version

melkati · Dec 8, 2021 · c5194e3 · c5194e3
1 parent 91b8c94
commit c5194e3
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/release2.yml b/.github/workflows/release2.yml
@@ -89,11 +89,11 @@ jobs:
             echo "        \"chipFamily\": \"ESP32\"," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "        \"improv\": false," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "        \"parts\": [" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
-            echo "          { \"path\": \"bootloader_dio_40m.bin\", \"offset\": 4096  }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
-            echo "          { \"path\": \"partitions.bin\", \"offset\": 32768 }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
+            echo "          { \"path\": \"${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-bootloader.bin\", \"offset\": 4096  }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
+            echo "          { \"path\": \"${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-partitions.bin\", \"offset\": 32768 }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "          { \"path\": \"boot_app0.bin\", \"offset\": 57344 }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
-            echo "          { \"path\": \"${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}.bin\", \"offset\": 65536 }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
-            echo "          { \"path\": \"spiffs-${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}.bin\", \"offset\": 3997696 }" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
+            echo "          { \"path\": \"${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-firmware.bin\", \"offset\": 65536 }," >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
+            echo "          { \"path\": \"${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-spiffs.bin\", \"offset\": 3997696 }" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "        ]" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "      }" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
             echo "  ]" >> ${{ github.event.repository.name }}-${{ matrix.environment }}.manifest.json
@@ -120,9 +120,9 @@ jobs:
           if: startsWith(github.ref, 'refs/tags/')
           run: |
             ls -la ./firmware
-            cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/bin/bootloader_dio_40m.bin ./firmware/${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}-bootloader.bin
-            cp .pio/build/${{ matrix.environment }}/partitions.bin  ./firmware/${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}-partitions.bin
-            cp .pio/build/${{ matrix.environment }}/firmware.bin    ./firmware/${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}-firmware.bin
+            cp ~/.platformio/packages/framework-arduinoespressif32/tools/sdk/bin/bootloader_dio_40m.bin ./firmware/${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-bootloader.bin
+            cp .pio/build/${{ matrix.environment }}/partitions.bin  ./firmware/${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-partitions.bin
+            cp .pio/build/${{ matrix.environment }}/firmware.bin    ./firmware/${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-firmware.bin
 
         - name: Build spiffs file
           run: |
@@ -132,14 +132,14 @@ jobs:
           if: startsWith(github.ref, 'refs/tags/')
           run: |
             ls -la ./firmware
-            cp .pio/build/${{ matrix.environment }}/spiffs.bin    ./firmware/${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}-spiffs.bin
+            cp .pio/build/${{ matrix.environment }}/spiffs.bin    ./firmware/${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}-spiffs.bin
 
         - name: Create Release
           id: create_release
           uses: softprops/action-gh-release@v1
           if: startsWith(github.ref, 'refs/tags/')
           with:
-            name: ${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}-${{ matrix.environment }}
+            name: ${{ github.event.repository.name }}-${{ matrix.environment }}-${{ steps.get_version.outputs.VERSION }}
             files: |
               ./firmware/*.bin
               ./firmware/*.json