Merge pull request #540 from jLynx/next

Nightlys now include flashing software

.github/workflows/create_nightly_release.yml

@@ -49,7 +49,7 @@ jobs:
         run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
       - name: Create Firmware ZIP
         run: |
-          zip --junk-paths firmware build/firmware/portapack-h1_h2-mayhem.bin
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
       - name: Create SD Card ZIP
         run: |
           zip -r sdcard.zip sdcard
@@ -96,4 +96,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./sdcard.zip
           asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip