From b50be7e8259e14410f38fe6ef94b90a62afb0960 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:12:24 +0100 Subject: [PATCH 1/8] Update --- code/components/esp32-camera | 2 +- code/components/tflite-micro-esp-examples | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/components/esp32-camera b/code/components/esp32-camera index 5c8349f4..de025b8f 160000 --- a/code/components/esp32-camera +++ b/code/components/esp32-camera @@ -1 +1 @@ -Subproject commit 5c8349f4cf169c8a61283e0da9b8cff10994d3f3 +Subproject commit de025b8f40e45b4b264b2cdd385000d151d8986a diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index 095f55a6..2a93aa31 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 095f55a6ee0b9d51f59a7a05d405df2e6336c178 +Subproject commit 2a93aa3106f181768d75f64bcac629f344a2ca22 From a38837c61b91040ad2f21f2ab4445ebd428889f3 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Sun, 27 Nov 2022 09:13:12 +0100 Subject: [PATCH 2/8] Revert "Update" This reverts commit b50be7e8259e14410f38fe6ef94b90a62afb0960. --- code/components/esp32-camera | 2 +- code/components/tflite-micro-esp-examples | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/components/esp32-camera b/code/components/esp32-camera index de025b8f..5c8349f4 160000 --- a/code/components/esp32-camera +++ b/code/components/esp32-camera @@ -1 +1 @@ -Subproject commit de025b8f40e45b4b264b2cdd385000d151d8986a +Subproject commit 5c8349f4cf169c8a61283e0da9b8cff10994d3f3 diff --git a/code/components/tflite-micro-esp-examples b/code/components/tflite-micro-esp-examples index 2a93aa31..095f55a6 160000 --- a/code/components/tflite-micro-esp-examples +++ b/code/components/tflite-micro-esp-examples @@ -1 +1 @@ -Subproject commit 2a93aa3106f181768d75f64bcac629f344a2ca22 +Subproject commit 095f55a6ee0b9d51f59a7a05d405df2e6336c178 From c0ec71d0e1c79930cb74bf7c21183937b0b162e9 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 11:36:53 +0100 Subject: [PATCH 3/8] fix key of caches --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a35963cb..fa80b3a4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -251,7 +251,7 @@ jobs: ./code/.pio/build/esp32cam/partitions.bin ./code/.pio/build/esp32cam/bootloader.bin ./sd-card/html/version.txt - key: ${{ github.run_number }} + key: ${{ steps.vars.outputs.branch }} # import the changes from - name: Get generated files from cache @@ -259,7 +259,7 @@ jobs: with: path: | ./dist - key: ${{ github.run_number }}-pack-for-OTA-v2 + key: ${{ steps.vars.outputs.branch }}-pack-for-OTA-v2 # import cached artifacts from pack-for-fresh-install - name: Get generated files from cache @@ -267,7 +267,7 @@ jobs: with: path: | ./firmware - key: ${{ github.run_number }}-pack-for-fresh-install + key: ${{ steps.vars.outputs.branch }}-pack-for-fresh-install - name: Set Variables id: vars From a88308b0465b4346cc0b28847375743bf00c11e9 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 12:02:40 +0100 Subject: [PATCH 4/8] fix key caches --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fa80b3a4..2279998c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -251,7 +251,7 @@ jobs: ./code/.pio/build/esp32cam/partitions.bin ./code/.pio/build/esp32cam/bootloader.bin ./sd-card/html/version.txt - key: ${{ steps.vars.outputs.branch }} + key: ${{ github.run_number }} # import the changes from - name: Get generated files from cache @@ -267,7 +267,7 @@ jobs: with: path: | ./firmware - key: ${{ steps.vars.outputs.branch }}-pack-for-fresh-install + key: ${{ steps.vars.outputs.branch }} - name: Set Variables id: vars From 88e5fb90fcc856264c98019c8fa8a869adcd213d Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 12:20:24 +0100 Subject: [PATCH 5/8] fix cache keys --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2279998c..53eb4dc6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -267,7 +267,7 @@ jobs: with: path: | ./firmware - key: ${{ steps.vars.outputs.branch }} + key: ${{ github.run_number }}-pack-for-fresh-install - name: Set Variables id: vars From 7a5524e4cf0b5d350871b0ff294212330a14deed Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 12:38:37 +0100 Subject: [PATCH 6/8] fix cache keys --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 53eb4dc6..56f68716 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -278,7 +278,10 @@ jobs: - name: Prepare artifacts for release run: | mkdir -p release + mkdir -p dist # create a update.zip like "update__rolling" + pwd + ls cd ./dist zip -r ../release/update.zip . cd ../firmware From de5165687b3a01ec64de0b4e96970ee7c0d52f93 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 12:45:24 +0100 Subject: [PATCH 7/8] move set variables to top --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 56f68716..7344f3e5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -242,6 +242,10 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Set Variables + id: vars + run: | + echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Get generated files from cache uses: actions/cache@v3 @@ -269,10 +273,6 @@ jobs: ./firmware key: ${{ github.run_number }}-pack-for-fresh-install - - name: Set Variables - id: vars - run: | - echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Prepare artifacts for release From f682fead2cce58c00f639c4b611e1f796976fcb8 Mon Sep 17 00:00:00 2001 From: Frank Haverland Date: Sun, 27 Nov 2022 13:01:15 +0100 Subject: [PATCH 8/8] debug --- .github/workflows/build.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7344f3e5..f629fff0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -170,9 +170,8 @@ jobs: - name: Store generated files in cache uses: actions/cache@v3 with: - path: | - ./dist - key: ${{ steps.vars.outputs.branch }}-pack-for-OTA-v2 + path: dist + key: ${{ github.run_number }}-pack-for-OTA-v2 @@ -225,8 +224,7 @@ jobs: - name: Store generated files in cache uses: actions/cache@v3 with: - path: | - ./firmware + path: firmware key: ${{ github.run_number }}-pack-for-fresh-install @@ -261,16 +259,14 @@ jobs: - name: Get generated files from cache uses: actions/cache@v3 with: - path: | - ./dist - key: ${{ steps.vars.outputs.branch }}-pack-for-OTA-v2 + path: dist + key: ${{ github.run_number }}-pack-for-OTA-v2 # import cached artifacts from pack-for-fresh-install - name: Get generated files from cache uses: actions/cache@v3 with: - path: | - ./firmware + path: firmware key: ${{ github.run_number }}-pack-for-fresh-install @@ -281,7 +277,7 @@ jobs: mkdir -p dist # create a update.zip like "update__rolling" pwd - ls + ls ./dist cd ./dist zip -r ../release/update.zip . cd ../firmware