Просмотр исходного кода

Merge branch 'rolling' into master

CaCO3 3 лет назад
Родитель
Сommit
5a03bf82d7
3 измененных файлов с 21 добавлено и 27 удалено
  1. 9 2
      .github/workflows/build.yaml
  2. 1 1
      .github/workflows/manual-update-webinstaller.yml
  3. 11 24
      Changelog.md

+ 9 - 2
.github/workflows/build.yaml

@@ -72,7 +72,8 @@ jobs:
 
     - name: Prepare Web UI (copy data from repo and update hashes in all files)
       run: |
-        rm -rf ./html; mkdir html
+        rm -rf ./html
+        mkdir html
         cp ./sd-card/html/* ./html/
         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
       run: |
+        rm -rf ./update
         mkdir -p ./update
         cp "./code/.pio/build/esp32cam/firmware.bin" "update/firmware.bin"
 
@@ -127,6 +129,7 @@ jobs:
 
     - name: Add CNN to update
       run: |
+        rm -rf ./update/config/
         mkdir -p ./update/config/
         cp ./sd-card/config/*.tfl ./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
       run: |
+        rm -rf ./remote_setup
         mkdir -p ./remote_setup
-        cp "./code/.pio/build/esp32cam/firmware.bin" "remote_setup/firmware.bin"
 
     - name: Add Web UI to remote_setup
       run: cp -r ./html ./remote_setup/
 
     - name: Add whole config folder to remote_setup
       run: |
+        rm -rf ./remote_setup/config/
         mkdir -p ./remote_setup/config/
         cp ./sd-card/config/* ./remote_setup/config/ 2>/dev/null || true
 
@@ -235,8 +239,10 @@ jobs:
 
     - name: Prepare manual_setup__*.zip artifact
       run: |
+        rm -rf manual_setup
         mkdir -p manual_setup
         rm -rf manual_setup/*.zip
+        rm -rf release
         mkdir -p release
         # copy builds to manual_setup folder
         cp -f "./code/.pio/build/esp32cam/firmware.bin" "manual_setup/firmware.bin"
@@ -298,6 +304,7 @@ jobs:
 
     - name: Prepare artifacts for release
       run: |
+        rm -rf release
         mkdir -p release
 
         # create AI-on-the-edge-device__update__*.zip like "AI-on-the-edge-device__update__v13.0.5.zip"

+ 1 - 1
.github/workflows/manual-update-webinstaller.yml

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

+ 11 - 24
Changelog.md

@@ -2,10 +2,6 @@
 
 ## [Unreleased]
 
-## [14.0.0-RC7] - 2023-01-30
-
-## [14.0.0-RC7] - 2023-01-29
-
 **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:
@@ -153,8 +149,8 @@ Improve **u**ser e**x**perience
 5.  Now you can reboot.
 
 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. Use the initial_esp32_setup.zip ( <https://github.com/jomjol/AI-on-the-edge-device/wiki/Installation> ) as alternative.
+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.
 
 ### Added
 
@@ -806,32 +802,23 @@ External Illumination
 
 -   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.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.4
 
-[13.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/12.0.1...13.0.1
 
-[12.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/11.3.1...12.0.1
+[13.0.8]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.8
 
-[11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.3
+[13.0.7]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.7
 
-[11.4.2]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.4.2
+[13.0.5]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.5
 
-[11.3.9]: https://github.com/haverland/AI-on-the-edge-device/compare/10.6.2...11.3.9
+[13.0.4]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.4
 
-[Unreleased]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC7...HEAD
+[13.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v12.0.1...v13.0.1
 
-[14.0.0-RC7]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC7...14.0.0-RC7
+[12.0.1]: https://github.com/jomjol/AI-on-the-edge-device/compare/v11.3.1...v12.0.1
 
-[14.0.0-RC7]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC6...14.0.0-RC7
+[11.4.3]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.4.3
 
-[14.0.0-RC6]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC3...14.0.0-RC6
+[11.4.2]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.4.2
 
-[14.0.0-RC3]: https://github.com/jomjol/AI-on-the-edge-device/compare/14.0.0-RC2...14.0.0-RC3
+[11.3.9]: https://github.com/haverland/AI-on-the-edge-device/compare/v10.6.2...v11.3.9