From f5136b2798e49dc5440cf2d4e4d8411a7fca25b7 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:12:08 +0000 Subject: [PATCH 01/13] fix for esp-idf 5.2 complaining about missing define --- src/lgfx/v1/platforms/esp32/common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp index 87942a3c..9d5867e0 100644 --- a/src/lgfx/v1/platforms/esp32/common.cpp +++ b/src/lgfx/v1/platforms/esp32/common.cpp @@ -486,7 +486,7 @@ namespace lgfx buscfg.flags = SPICOMMON_BUSFLAG_MASTER; buscfg.intr_flags = 0; #if defined (ESP_IDF_VERSION_VAL) - #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)) + #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)) buscfg.isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO; #else #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)) From c69e9a9046b9e5687a6ba231f09c7f08fdd992f6 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:13:28 +0000 Subject: [PATCH 02/13] Update IDFBuild.yml --- .github/workflows/IDFBuild.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml index 9a6f49dc..5574ad8d 100644 --- a/.github/workflows/IDFBuild.yml +++ b/.github/workflows/IDFBuild.yml @@ -1,5 +1,7 @@ name: IDFBuild + + env: REPO_URL: https://github.com/espressif/esp-idf PROJECT_DIR: examples/Test/build_test From d82470ea0645bcfe739e01ee18ddc024ff8c9231 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:19:33 +0000 Subject: [PATCH 03/13] another fix for esp-idf 5.2 --- src/lgfx/v1/platforms/esp32/common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp index 9d5867e0..df3dd20d 100644 --- a/src/lgfx/v1/platforms/esp32/common.cpp +++ b/src/lgfx/v1/platforms/esp32/common.cpp @@ -830,7 +830,7 @@ namespace lgfx } #if defined (CONFIG_IDF_TARGET_ESP32S3) #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 3) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0)) \ - || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 1) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 2, 0)) \ + || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 1) && ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 2, 0)) \ || (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)) (&dev->comd[0])[index].val = cmd_val; #else From 988d2ca852ec8f2ad73a33cc85bd92585ac86f1e Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:34:53 +0000 Subject: [PATCH 04/13] another fix for esp-idf 5.2 --- src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp b/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp index aae32e73..deaa6cf6 100644 --- a/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp +++ b/src/lgfx/v1_autodetect/LGFX_AutoDetect_ESP32_all.hpp @@ -3325,7 +3325,7 @@ namespace lgfx }; - std::uint32_t pkg_ver = lgfx::get_pkg_ver(); + uint32_t pkg_ver = lgfx::get_pkg_ver(); ESP_LOGV("LGFX", "pkg: %lu", (unsigned long)pkg_ver); switch (pkg_ver) From 68258851bb05be0e3546ba0a4b7bfe1ceb26329a Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:41:04 +0000 Subject: [PATCH 05/13] fix nodejs warning --- .github/workflows/IDFBuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml index 5574ad8d..f87b3488 100644 --- a/.github/workflows/IDFBuild.yml +++ b/.github/workflows/IDFBuild.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} @@ -62,7 +62,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} From 9134032a3dcc8a7e0e0579a9b428d99b8e07d2b6 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:43:42 +0000 Subject: [PATCH 06/13] fix nodejs warning --- .github/workflows/ArduinoBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml index 5ce1c8cc..b356df39 100644 --- a/.github/workflows/ArduinoBuild.yml +++ b/.github/workflows/ArduinoBuild.yml @@ -73,7 +73,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} From 64d4b9396f9d852487dbb31c6b8aa7f488531518 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:45:42 +0000 Subject: [PATCH 07/13] fix nodejs warning --- .github/workflows/OpenCVBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OpenCVBuild.yml b/.github/workflows/OpenCVBuild.yml index a65ff860..7ac41c6a 100644 --- a/.github/workflows/OpenCVBuild.yml +++ b/.github/workflows/OpenCVBuild.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 🪟 📦 Use GNU tar instead BSD tar if: matrix.os == 'windows-latest' From a94da6bcda0d519a349fd1fe61397b4d46c54d28 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:46:38 +0000 Subject: [PATCH 08/13] fix nodejs warning --- .github/workflows/PlatformioBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 78240006..18fa99dd 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -68,7 +68,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} From dc8a3073ed0dc4807af9c22ab9e884db9b0c59b4 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:47:22 +0000 Subject: [PATCH 09/13] fix nodejs warning --- .github/workflows/SDLBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SDLBuild.yml b/.github/workflows/SDLBuild.yml index 86e80faf..a68f25b2 100644 --- a/.github/workflows/SDLBuild.yml +++ b/.github/workflows/SDLBuild.yml @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache SDL2 for Windows From ee5b8350ec5f8208afc2643d1eb3decdb4117daf Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:47:53 +0000 Subject: [PATCH 10/13] fix nodejs warning --- .github/workflows/pioPkgPublish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pioPkgPublish.yml b/.github/workflows/pioPkgPublish.yml index 5ed95e4e..d2f4249d 100644 --- a/.github/workflows/pioPkgPublish.yml +++ b/.github/workflows/pioPkgPublish.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} From 721a8dfdfbf6803b5098abbbd21763be5ac9faf7 Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:50:51 +0000 Subject: [PATCH 11/13] fix nodejs warning --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 2ea95bef..11c6cc17 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,7 +12,7 @@ jobs: env: ACTIONS_STEP_DEBUG: true steps: - - uses: actions/stale@v3.0.14 + - uses: actions/stale@v9.0.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.' From 31a7c8b0d0b8a8f64874b803e15c95e14697f0bb Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:53:04 +0000 Subject: [PATCH 12/13] fix nodejs warnings --- .github/workflows/PlatformioBuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml index 18fa99dd..459ceecd 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/PlatformioBuild.yml @@ -73,19 +73,19 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.platformio key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.9' From e42fb8bf9e6085df628f329a9d469dead868a14e Mon Sep 17 00:00:00 2001 From: tobozo Date: Sat, 17 Feb 2024 14:54:44 +0000 Subject: [PATCH 13/13] fix nodejs warnings --- .github/workflows/SDLBuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/SDLBuild.yml b/.github/workflows/SDLBuild.yml index a68f25b2..14d731cc 100644 --- a/.github/workflows/SDLBuild.yml +++ b/.github/workflows/SDLBuild.yml @@ -54,7 +54,7 @@ jobs: - name: Cache SDL2 for Windows if: ${{ matrix.os == 'windows-latest' }} - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-SLD2-windows with: path: contrib @@ -111,7 +111,7 @@ jobs: - name: Upload WASM artifact if: ${{ matrix.os == 'ubuntu-latest' }} - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: path: ${{env.WASM_DIR}}/build/www