|
|
@@ -53,8 +53,8 @@ jobs:
|
|
|
#########################################################################################
|
|
|
pack-for-OTA-v1:
|
|
|
# Old OTA concept
|
|
|
- # firmware__*.zip needs to be unpacked before attaching to the release!
|
|
|
- # The bin filename can contain versioning.
|
|
|
+ # firmware__*.zip needs to be unpacked before attaching to the release (the artifact uploader always zipps the files)!
|
|
|
+ # The bin filename is allowed to contain versioning information.
|
|
|
runs-on: ubuntu-latest
|
|
|
needs: build
|
|
|
|
|
|
@@ -84,7 +84,6 @@ jobs:
|
|
|
- name: Upload Firmware artifact (old OTA concept)
|
|
|
uses: actions/upload-artifact@v3
|
|
|
with:
|
|
|
-# name: "firmware__${{ github.ref_name }}__(${{ steps.vars.outputs.sha_short }})__(extract_before_upload__only_needed_for_migration_from_11.3.1)"
|
|
|
name: "firmware__(extract_before_upload)__${{ github.ref_name }}__(${{ steps.vars.outputs.sha_short }})"
|
|
|
path: ./dist_old_ota/*
|
|
|
|
|
|
@@ -100,7 +99,7 @@ jobs:
|
|
|
## Pack for new OTA (v2)
|
|
|
#########################################################################################
|
|
|
pack-for-OTA-v2:
|
|
|
- # New OTA concept
|
|
|
+ # New OTA concept (> v11.3.1)
|
|
|
# update__version.zip file with following content:
|
|
|
# - /firmware.bin
|
|
|
# - (optional) /html/*
|
|
|
@@ -130,21 +129,9 @@ jobs:
|
|
|
run: |
|
|
|
mkdir -p ./dist
|
|
|
cp "./code/.pio/build/esp32cam/firmware.bin" "dist/firmware.bin"
|
|
|
-
|
|
|
-# - name: Upload update.zip Artifact (Firmware only)
|
|
|
-# uses: actions/upload-artifact@v3
|
|
|
-# with:
|
|
|
-# name: "update_firmware_only__${{ github.ref_name }}_(${{ steps.vars.outputs.sha_short }})"
|
|
|
-# path: ./dist/*
|
|
|
|
|
|
- name: Add Web UI to dist
|
|
|
run: cp -r ./sd-card/html ./dist/
|
|
|
-
|
|
|
-# - name: Upload update.zip artifact (Firmware + Web UI)
|
|
|
-# uses: actions/upload-artifact@v3
|
|
|
-# with:
|
|
|
-# name: "update_firmware+webinterface__${{ github.ref_name }}_(${{ steps.vars.outputs.sha_short }})"
|
|
|
-# path: ./dist/*
|
|
|
|
|
|
- name: Add CNN to dist
|
|
|
run: |
|
|
|
@@ -171,7 +158,6 @@ jobs:
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
#########################################################################################
|
|
|
## Pack for a fresh install (USB flashing)
|
|
|
#########################################################################################
|
|
|
@@ -193,6 +179,8 @@ jobs:
|
|
|
./sd-card/html/version.txt
|
|
|
key: ${{ github.run_number }}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
#########################################################################################
|
|
|
## Prepare and create release
|
|
|
#########################################################################################
|
|
|
@@ -211,7 +199,7 @@ jobs:
|
|
|
./code/.pio/build/esp32cam/partitions.bin
|
|
|
./code/.pio/build/esp32cam/bootloader.bin
|
|
|
./sd-card/html/version.txt
|
|
|
- ./dist
|
|
|
+ ./dist
|
|
|
key: ${{ github.run_number }}-pack-for-OTA-v2
|
|
|
|
|
|
- name: Set Variables
|
CaCO3