use update.zip from branch-action

This commit is contained in:
Frank Haverland
2022-09-25 14:05:41 +02:00
parent f9939023c6
commit 0d67282c00
3 changed files with 24 additions and 21 deletions

View File

@@ -181,24 +181,30 @@ jobs:
./sd-card/html/version.txt ./sd-card/html/version.txt
key: ${{ github.run_number }} key: ${{ github.run_number }}
#########################################################################################
## Prepare release
#########################################################################################
- name: Set Variables - name: Set Variables
id: vars id: vars
run: | run: |
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- name: Copy artifacts to firmware folder and create initial_esp32_setup.zip - name: Prepare artifacts for release
if: startsWith(github.ref, 'refs/tags/')
run: | run: |
mkdir -p firmware mkdir -p release
# copy builds to firmware folder for committing in next step # copy builds to release folder
cp -f "./code/.pio/build/esp32cam/firmware.bin" "firmware/firmware.bin" cp -f "./code/.pio/build/esp32cam/firmware.bin" "release/firmware.bin"
cp -f "./code/.pio/build/esp32cam/bootloader.bin" "firmware/bootloader.bin" cp -f "./code/.pio/build/esp32cam/bootloader.bin" "release/bootloader.bin"
cp -f "./code/.pio/build/esp32cam/partitions.bin" "firmware/partitions.bin" cp -f "./code/.pio/build/esp32cam/partitions.bin" "release/partitions.bin"
rm -rf ./release/*
cd sd-card cd sd-card
rm -f ../firmware/html.zip zip -r ../release/html.zip html
rm -f ../firmware/README.md # create a update.zip like "update__rolling"
zip -r ../firmware/html.zip html
mkdir ../dist
cd ../dist cd ../dist
zip -r ../release/update.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 + CNN)
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@@ -238,7 +244,7 @@ jobs:
name: ${{ steps.get_version.outputs.version-without-v }} name: ${{ steps.get_version.outputs.version-without-v }}
body: ${{ steps.extract-release-notes.outputs.release_notes }} body: ${{ steps.extract-release-notes.outputs.release_notes }}
files: | files: |
firmware/* release/*
# Commit&Push Changelog to master branch. Must be manually merged back to rolling # Commit&Push Changelog to master branch. Must be manually merged back to rolling

4
.gitignore vendored
View File

@@ -7,7 +7,9 @@
/sd-card/html/debug/ /sd-card/html/debug/
/firmware/ /firmware/
version.txt version.txt
/dist/
/dist_release/
/dist_old_ota
CMakeLists.txt.user CMakeLists.txt.user
CMakeCache.txt CMakeCache.txt
CMakeFiles CMakeFiles

View File

@@ -1,20 +1,15 @@
# Changelog # Changelog
## [Unreleased] ## [Unreleased]
## [11.3.9] - 2022-09-20
### Added ### Added
- auto release creation - automatic release creation
- newest firmware of rolling branch now uploaded to <https://github.com/jomjol/AI-on-the-edge-device/actions>
### Changed - #1068 new safer and easier update mechanismn. Use only the update.zip of the release for firmware, html and new models.
- something else
### Fixed ### Fixed
- \#924 - fix of the Fix - #1029 wrong change of checkDigitConsistency now working like releases before 11.3.1
## [10.6.2] - (2022-07-24) ## [10.6.2] - (2022-07-24)