From 42fcffa37fda2951ff13bb8b30076c22e2b1b9a7 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 02:23:34 +0100 Subject: [PATCH 01/11] Add dbl build test --- .github/workflows/build-clang-doxy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 7c1c7c210..56137c228 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -204,7 +204,9 @@ jobs: - name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder run: | cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - - name: Build for ESP32-SX + - name: Build for ESP32-SX #1 + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + - name: 2nd Build for ESP32-SX #2 run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list run: | From 49c7198a24ed06212b7327f0c2b94c763591056b Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 02:47:49 +0100 Subject: [PATCH 02/11] Reset current folder test --- .github/workflows/build-clang-doxy.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 56137c228..3dd637495 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -205,9 +205,13 @@ jobs: run: | cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX #1 - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + run: + echo >>$GITHUB_ENV WS_PATH=$(pwd) + python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: 2nd Build for ESP32-SX #2 - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + run: | + cd $WS_PATH + python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list run: | ls From cb9ef47b6028c19c0e7a0143a896510746caa4d8 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 02:53:37 +0100 Subject: [PATCH 03/11] tweak WS_PATH --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 3dd637495..afdecd581 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -206,7 +206,7 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX #1 run: - echo >>$GITHUB_ENV WS_PATH=$(pwd) + echo >>$GITHUB_ENV WS_PATH=$(pwd) python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: 2nd Build for ESP32-SX #2 run: | From 5a3823aafae4be4ad87c699605bf5b0fc7fbad33 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 02:55:10 +0100 Subject: [PATCH 04/11] Move variable setting to last line of step --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index afdecd581..22d707004 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -206,8 +206,8 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX #1 run: - echo >>$GITHUB_ENV WS_PATH=$(pwd) python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + echo >>$GITHUB_ENV WS_PATH=$(pwd) - name: 2nd Build for ESP32-SX #2 run: | cd $WS_PATH From dfecf2b97c01ac855be7427647398062548dc426 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 02:57:10 +0100 Subject: [PATCH 05/11] Fix missing pipe --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 22d707004..cd184594c 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -205,9 +205,9 @@ jobs: run: | cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX #1 - run: + run: | + echo >>$GITHUB_ENV WS_PATH=$(pwd) python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - echo >>$GITHUB_ENV WS_PATH=$(pwd) - name: 2nd Build for ESP32-SX #2 run: | cd $WS_PATH From 00c318bb78a0df305425a5fc11b49d609660506e Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 13:03:53 +0100 Subject: [PATCH 06/11] Add set folder in python to refresh link --- .github/workflows/build-clang-doxy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index cd184594c..c89c033fd 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -211,6 +211,8 @@ jobs: - name: 2nd Build for ESP32-SX #2 run: | cd $WS_PATH + # set current folder to WS_PATH + python3 -c 'import os; os.chdir(os.environ["WS_PATH"]); print("current folder: ", os.getcwd())' python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: list run: | From 84fcbffd5efce815195bdd107a70c8106a1e2e45 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 13:19:11 +0100 Subject: [PATCH 07/11] Rename builds --- .github/workflows/build-clang-doxy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index c89c033fd..31edc724b 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -13,7 +13,7 @@ on: jobs: build-esp32sx-esptool: - name: Build WipperSnapper ESP32-Sx + name: 🏗️ESP32-Sx runs-on: ubuntu-latest strategy: fail-fast: false @@ -143,7 +143,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 build-esp32sx: - name: Build WipperSnapper ESP32-Sx + name: 🏗️ESP32-Sx runs-on: ubuntu-latest strategy: fail-fast: false @@ -231,7 +231,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin build-esp32: - name: Build WipperSnapper ESP32, ESP32-C3 + name: 🏗️ESP32, ESP32-C3 runs-on: ubuntu-latest strategy: fail-fast: false @@ -345,7 +345,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip build-samd: - name: Build WipperSnapper SAMD + name: 🏗️SAMD runs-on: ubuntu-latest strategy: fail-fast: false @@ -401,7 +401,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex build-rp2040: - name: Build WipperSnapper RP2040 + name: 🏗️RP2040 runs-on: ubuntu-latest strategy: fail-fast: false @@ -450,7 +450,7 @@ jobs: # NOTE: This does NOT release artifacts, it only builds build-samd-non-fs: - name: Build WipperSnapper SAMD (NO-TINYUSB) + name: 🏗️SAMD (NO-TINYUSB) runs-on: ubuntu-latest strategy: fail-fast: false @@ -490,7 +490,7 @@ jobs: run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 build-esp8266: - name: Build WipperSnapper ESP8266 + name: 🏗️ESP8266 runs-on: ubuntu-latest strategy: fail-fast: false @@ -546,7 +546,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip build-esp32sx-dev: - name: Build WipperSnapper ESP32-Sx DEV BUILDS + name: 🏗️ESP32-Sx DEV BUILDS runs-on: ubuntu-latest strategy: fail-fast: false From 1563c344fbff24e80deb164ad9395b6bf67aa728 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 13:49:09 +0100 Subject: [PATCH 08/11] Swap CI branch to ignore deps --- .github/workflows/build-clang-doxy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 31edc724b..0a65f1f83 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -175,7 +175,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: adafruit/ci-arduino + repository: tyeth/ci-arduino + ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt path: ci - name: Install CI-Arduino run: bash ci/actions_install.sh From 7b2cea1ce6ddf44820e961ed536ad4307705882d Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 14:08:23 +0100 Subject: [PATCH 09/11] Add flag for generate/include header --- .github/workflows/build-clang-doxy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 0a65f1f83..e04ea7c58 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -208,13 +208,13 @@ jobs: - name: Build for ESP32-SX #1 run: | echo >>$GITHUB_ENV WS_PATH=$(pwd) - python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --print_dependencies_as_header - name: 2nd Build for ESP32-SX #2 run: | cd $WS_PATH # set current folder to WS_PATH python3 -c 'import os; os.chdir(os.environ["WS_PATH"]); print("current folder: ", os.getcwd())' - python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 + python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header - name: list run: | ls From f1f60d6125f0cdf3fd4826daf2fda3fccd92c580 Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 14:16:58 +0100 Subject: [PATCH 10/11] Retest with no CD/chdir --- .github/workflows/build-clang-doxy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index e04ea7c58..a320d515b 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -207,13 +207,13 @@ jobs: cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - name: Build for ESP32-SX #1 run: | - echo >>$GITHUB_ENV WS_PATH=$(pwd) + # echo >>$GITHUB_ENV WS_PATH=$(pwd) python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --print_dependencies_as_header - name: 2nd Build for ESP32-SX #2 run: | - cd $WS_PATH + # cd $WS_PATH # set current folder to WS_PATH - python3 -c 'import os; os.chdir(os.environ["WS_PATH"]); print("current folder: ", os.getcwd())' + # python3 -c 'import os; os.chdir(os.environ["WS_PATH"]); print("current folder: ", os.getcwd())' python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header - name: list run: | From a3422a2dbe2ca66d51d2990e35c46c34f3ac448c Mon Sep 17 00:00:00 2001 From: tyeth Date: Tue, 30 Jul 2024 16:03:21 +0100 Subject: [PATCH 11/11] Single build step --- .github/workflows/build-clang-doxy.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index a320d515b..201cd77e8 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -205,15 +205,8 @@ jobs: - name: Copy lv_conf.h file in Adafruit_LittlevGL_Glue_Library to the arduino library folder run: | cp /home/runner/Arduino/libraries/Adafruit_LittlevGL_Glue_Library/lv_conf.h /home/runner/Arduino/libraries - - name: Build for ESP32-SX #1 + - name: Build for ESP32-SX #2 run: | - # echo >>$GITHUB_ENV WS_PATH=$(pwd) - python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --print_dependencies_as_header - - name: 2nd Build for ESP32-SX #2 - run: | - # cd $WS_PATH - # set current folder to WS_PATH - # python3 -c 'import os; os.chdir(os.environ["WS_PATH"]); print("current folder: ", os.getcwd())' python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header - name: list run: |