diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b9c1ef81..56009803 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -181,24 +181,30 @@ jobs: ./sd-card/html/version.txt key: ${{ github.run_number }} +######################################################################################### +## Prepare release +######################################################################################### + - name: Set Variables id: vars run: | 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: | - mkdir -p firmware - # copy builds to firmware folder for committing in next step - cp -f "./code/.pio/build/esp32cam/firmware.bin" "firmware/firmware.bin" - cp -f "./code/.pio/build/esp32cam/bootloader.bin" "firmware/bootloader.bin" - cp -f "./code/.pio/build/esp32cam/partitions.bin" "firmware/partitions.bin" + mkdir -p release + # copy builds to release folder + cp -f "./code/.pio/build/esp32cam/firmware.bin" "release/firmware.bin" + cp -f "./code/.pio/build/esp32cam/bootloader.bin" "release/bootloader.bin" + cp -f "./code/.pio/build/esp32cam/partitions.bin" "release/partitions.bin" + rm -rf ./release/* cd sd-card - rm -f ../firmware/html.zip - rm -f ../firmware/README.md - zip -r ../firmware/html.zip html - mkdir ../dist + zip -r ../release/html.zip html + # create a update.zip like "update__rolling" cd ../dist + zip -r ../release/update.zip . + - name: Upload initial_esp32_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI + CNN) uses: actions/upload-artifact@v3 @@ -238,7 +244,7 @@ jobs: name: ${{ steps.get_version.outputs.version-without-v }} body: ${{ steps.extract-release-notes.outputs.release_notes }} files: | - firmware/* + release/* # Commit&Push Changelog to master branch. Must be manually merged back to rolling diff --git a/.gitignore b/.gitignore index c7acff1b..facb4887 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,9 @@ /sd-card/html/debug/ /firmware/ version.txt - +/dist/ +/dist_release/ +/dist_old_ota CMakeLists.txt.user CMakeCache.txt CMakeFiles diff --git a/Changelog.md b/Changelog.md index 3e70925c..efe63fff 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,20 +1,15 @@ # Changelog ## [Unreleased] - -## [11.3.9] - 2022-09-20 - ### Added -- auto release creation - -### Changed - -- something else +- automatic release creation +- newest firmware of rolling branch now uploaded to +- #1068 new safer and easier update mechanismn. Use only the update.zip of the release for firmware, html and new models. ### 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)