Merge branch 'rolling' into master

This commit is contained in:
CaCO3
2023-01-30 22:18:50 +01:00
committed by GitHub
3 changed files with 21 additions and 27 deletions

View File

@@ -72,7 +72,8 @@ jobs:
- name: Prepare Web UI (copy data from repo and update hashes in all files) - name: Prepare Web UI (copy data from repo and update hashes in all files)
run: | run: |
rm -rf ./html; mkdir html rm -rf ./html
mkdir html
cp ./sd-card/html/* ./html/ cp ./sd-card/html/* ./html/
cd html; find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \; cd html; find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \;
@@ -119,6 +120,7 @@ jobs:
- name: Prepare update__*.zip artifact - name: Prepare update__*.zip artifact
run: | run: |
rm -rf ./update
mkdir -p ./update mkdir -p ./update
cp "./code/.pio/build/esp32cam/firmware.bin" "update/firmware.bin" cp "./code/.pio/build/esp32cam/firmware.bin" "update/firmware.bin"
@@ -127,6 +129,7 @@ jobs:
- name: Add CNN to update - name: Add CNN to update
run: | run: |
rm -rf ./update/config/
mkdir -p ./update/config/ mkdir -p ./update/config/
cp ./sd-card/config/*.tfl ./update/config/ 2>/dev/null || true cp ./sd-card/config/*.tfl ./update/config/ 2>/dev/null || true
cp ./sd-card/config/*.tflite ./update/config/ 2>/dev/null || true cp ./sd-card/config/*.tflite ./update/config/ 2>/dev/null || true
@@ -180,14 +183,15 @@ jobs:
- name: Prepare remote_setup__*.zip artifact - name: Prepare remote_setup__*.zip artifact
run: | run: |
rm -rf ./remote_setup
mkdir -p ./remote_setup mkdir -p ./remote_setup
cp "./code/.pio/build/esp32cam/firmware.bin" "remote_setup/firmware.bin"
- name: Add Web UI to remote_setup - name: Add Web UI to remote_setup
run: cp -r ./html ./remote_setup/ run: cp -r ./html ./remote_setup/
- name: Add whole config folder to remote_setup - name: Add whole config folder to remote_setup
run: | run: |
rm -rf ./remote_setup/config/
mkdir -p ./remote_setup/config/ mkdir -p ./remote_setup/config/
cp ./sd-card/config/* ./remote_setup/config/ 2>/dev/null || true cp ./sd-card/config/* ./remote_setup/config/ 2>/dev/null || true
@@ -235,8 +239,10 @@ jobs:
- name: Prepare manual_setup__*.zip artifact - name: Prepare manual_setup__*.zip artifact
run: | run: |
rm -rf manual_setup
mkdir -p manual_setup mkdir -p manual_setup
rm -rf manual_setup/*.zip rm -rf manual_setup/*.zip
rm -rf release
mkdir -p release mkdir -p release
# copy builds to manual_setup folder # copy builds to manual_setup folder
cp -f "./code/.pio/build/esp32cam/firmware.bin" "manual_setup/firmware.bin" cp -f "./code/.pio/build/esp32cam/firmware.bin" "manual_setup/firmware.bin"
@@ -298,6 +304,7 @@ jobs:
- name: Prepare artifacts for release - name: Prepare artifacts for release
run: | run: |
rm -rf release
mkdir -p release mkdir -p release
# create AI-on-the-edge-device__update__*.zip like "AI-on-the-edge-device__update__v13.0.5.zip" # create AI-on-the-edge-device__update__*.zip like "AI-on-the-edge-device__update__v13.0.5.zip"

View File

@@ -6,7 +6,7 @@
name: Manual Web Installer Update name: Manual Web Installer Update
on: on:
repository_dispatch: # Run on manual trigger workflow_dispatch: # Run on manual trigger
# push: # push:
# branches: # branches:
# - rolling # - rolling

View File

@@ -2,10 +2,6 @@
## [Unreleased] ## [Unreleased]
## [14.0.0-RC7] - 2023-01-30
## [14.0.0-RC7] - 2023-01-29
**Stabilization and Improved User Experience** **Stabilization and Improved User Experience**
Thanks to over 80 Pull Requests from 6 contributors, we can anounce another great release with many many improvements and new features: Thanks to over 80 Pull Requests from 6 contributors, we can anounce another great release with many many improvements and new features:
@@ -153,8 +149,8 @@ Improve **u**ser e**x**perience
5. Now you can reboot. 5. Now you can reboot.
If anything breaks you can try to If anything breaks you can try to
1. Call `http://<IP>/ota?task=update&file=firmware.bin` resp. `http://<IP>/ota?task=update&file=html.zip` if the upload successed but the extraction failed. 1\. Call `http://<IP>/ota?task=update&file=firmware.bin` resp. `http://<IP>/ota?task=update&file=html.zip` if the upload successed but the extraction failed.
1. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative. 1\. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.
### Added ### Added
@@ -806,32 +802,23 @@ External Illumination
- Initial Version - Initial Version
[14.0.0-RC2]: https://github.com/jomjol/AI-on-the-edge-device/compare/13.0.8...14.0.0-RC2
[13.0.8]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.8
[13.0.7]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.7
[13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.5 [13.0.8]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.8
[13.0.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.4 [13.0.7]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.7
[13.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.1 [13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.5
[12.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/11.3.1...12.0.1 [13.0.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.4
[11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.3 [13.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.1
[11.4.2]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.2 [12.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v11.3.1...v12.0.1
[11.3.9]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.3.9 [11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.4.3
[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC7...HEAD [11.4.2]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.4.2
[14.0.0-RC7]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC7...14.0.0-RC7 [11.3.9]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.3.9
[14.0.0-RC7]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC6...14.0.0-RC7
[14.0.0-RC6]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC3...14.0.0-RC6
[14.0.0-RC3]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC2...14.0.0-RC3