Merge branch 'master' into rolling

.github/workflows/build.yaml

@@ -158,6 +158,18 @@ jobs:
         name: "update__${{ github.ref_name }}_(${{ steps.vars.outputs.sha_short }})"
         path: ./dist/*
 
+    - name: Store generated files in cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ./code/.pio/build/esp32cam/firmware.bin
+          ./code/.pio/build/esp32cam/partitions.bin
+          ./code/.pio/build/esp32cam/bootloader.bin
+          ./sd-card/html/version.txt
+          ./dist
+        key: ${{ github.run_number }}-pack-for-OTA-v2
+
+
 
 
 #########################################################################################
@@ -182,31 +194,51 @@ jobs:
         key: ${{ github.run_number }}
 
 #########################################################################################
-## Prepare release
+## Prepare and create release
 #########################################################################################
+  release: 
+    runs-on: ubuntu-latest
+    needs: pack-for-OTA-v2
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get generated files from cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ./code/.pio/build/esp32cam/firmware.bin
+            ./code/.pio/build/esp32cam/partitions.bin
+            ./code/.pio/build/esp32cam/bootloader.bin
+            ./sd-card/html/version.txt
+             ./dist
+          key: ${{ github.run_number }}-pack-for-OTA-v2
 
       - name: Set Variables
         id: vars
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
+
       - name: Prepare artifacts for release
-      if: startsWith(github.ref, 'refs/tags/') 
         run: |
+          ls -la ./dist
+          mkdir -p firmware
+          rm -rf firmware/*
           mkdir -p release
-        # copy builds to release folder
+          # copy builds to firmware folder
-        cp -f "./code/.pio/build/esp32cam/firmware.bin" "release/firmware.bin"
+          cp -f "./code/.pio/build/esp32cam/firmware.bin" "firmware/firmware.bin"
-        cp -f "./code/.pio/build/esp32cam/bootloader.bin" "release/bootloader.bin"
+          cp -f "./code/.pio/build/esp32cam/bootloader.bin" "firmware/bootloader.bin"
-        cp -f "./code/.pio/build/esp32cam/partitions.bin" "release/partitions.bin"
+          cp -f "./code/.pio/build/esp32cam/partitions.bin" "firmware/partitions.bin"
-        rm -rf ./release/*
+          zip -r ./firmware/sd-card.zip sd-card
-        cd sd-card
-        zip -r ../release/html.zip html
           # create a update.zip like "update__rolling"
-        cd ../dist
+          cd ./dist
           zip -r ../release/update.zip .
+          cd ../firmware
+          zip -r ../release/initial_esp32_setup.zip .
           
 
-    - name: Upload initial_esp32_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI + CNN)
+      - name: Upload initial_esp32_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI)
         uses: actions/upload-artifact@v3
         with:
           name: "initial_esp32_setup__${{ github.ref_name }}_(${{ steps.vars.outputs.sha_short }})"

Changelog.md

@@ -1,15 +1,16 @@
 # Changelog
 
 ## [Unreleased]
+
 ### Added
 
 -   automatic release creation
 -   newest firmware of rolling branch now uploaded to <https://github.com/jomjol/AI-on-the-edge-device/actions>
-- #1068 new safer and easier update mechanismn. Use only the update.zip of the release for firmware, html and new models. 
+-   \#1068 new safer and easier update mechanismn. Use only the update.zip of the release for firmware, html and new models. 
 
 ### Fixed
 
-- #1029 wrong change of checkDigitConsistency now working like releases before 11.3.1 
+-   \#1029 wrong change of checkDigitConsistency now working like releases before 11.3.1 
 
 ## [10.6.2] - (2022-07-24)
 
@@ -566,6 +567,10 @@ External Illumination
 
 -   Initial Version
 
-[Unreleased]: https://github.com/haverland/AI-on-the-edge-device/compare/11.3.9...HEAD
+[Unreleased]: https://github.com/haverland/AI-on-the-edge-device/compare/11.4.3...HEAD
+
+[11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.3
+
+[11.4.2]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.2
 
 [11.3.9]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.3.9