From 574ad66ffd1abcfa614afb1cafce96daa84c5fc4 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 27 Sep 2024 13:08:07 +0100 Subject: [PATCH 1/5] Add merge steps + fix c6 dev asset name --- .github/workflows/build-clang-doxy.yml | 46 ++++++++++++++++++++------ 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 945acb933..cdd35838d 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 ESP32-Sx + name: 🏗️ESP32-Sx(lvgl) runs-on: ubuntu-latest strategy: fail-fast: false @@ -145,7 +145,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2 build-esp32sx: - name: Build ESP32-Sx + name: 🏗️ESP32-Sx runs-on: ubuntu-latest strategy: fail-fast: false @@ -227,7 +227,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin build-esp32: - name: Build ESP32 and Cx + name: 🏗️ESP32/Cx 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 @@ -402,7 +402,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 @@ -452,7 +452,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 @@ -492,7 +492,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 @@ -548,7 +548,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)) runs-on: ubuntu-latest strategy: fail-fast: false @@ -623,7 +623,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin build-esp32-dev: - name: Build WipperSnapper ESP32/Cx DEV BUILDS + name: 🏗️ESP32/Cx(DEV) runs-on: ubuntu-latest strategy: fail-fast: false @@ -731,12 +731,38 @@ jobs: - name: upload build artifacts zip uses: actions/upload-artifact@v4 with: - name: build-files-dev + name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }} path: | wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip + merge-job-build-files: + name: Merge Artifacts for build-files + runs-on: ubuntu-latest + needs: [build-esp32sx-esptool, build-esp32sx, build-esp32, build-esp8266, build-samd, build-rp2040, build-samd-non-fs] + + steps: + - name: Merge Artifacts from Builds + uses: actions/upload-artifact/merge@v4 + with: + name: build-files + pattern: build-files-!(dev)-* + delete-merged: true + + merge-job2: + name: Merge Artifacts for build-files-dev + runs-on: ubuntu-latest + needs: [build-esp32sx-dev, build-esp32-dev] + + steps: + - name: Merge Artifacts from Dev Builds + uses: actions/upload-artifact/merge@v4 + with: + name: build-files-dev + pattern: build-files-dev-* + delete-merged: true clang_and_doxy: + name: 🔎Clang & Doxygen runs-on: ubuntu-latest needs: [ From 198a0e5226d54ae3c0ff1327ab62175299aa5958 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 27 Sep 2024 13:57:16 +0100 Subject: [PATCH 2/5] Update actions/setup-python to v5 --- .github/workflows/build-clang-doxy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index cdd35838d..a5aaeb022 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -22,7 +22,7 @@ jobs: include: - offset: "0x1000" steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -166,7 +166,7 @@ jobs: "qtpy_esp32s3_n4r2", ] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -248,7 +248,7 @@ jobs: - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6" steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -357,7 +357,7 @@ jobs: "metro_m4_airliftlite_tinyusb", ] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -409,7 +409,7 @@ jobs: matrix: arduino-platform: ["picow_rp2040_tinyusb"] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -459,7 +459,7 @@ jobs: matrix: arduino-platform: ["mkrwifi1010", "nano_33_iot"] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -499,7 +499,7 @@ jobs: matrix: arduino-platform: ["feather_esp8266"] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -562,7 +562,7 @@ jobs: "feather_esp32s3_tft_debug", ] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -637,7 +637,7 @@ jobs: - offset: "0x0" arduino-platform: "wippersnapper_feather_esp32c6_debug" steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 @@ -774,7 +774,7 @@ jobs: build-rp2040, ] steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: actions/checkout@v4 From 9dfccb6a47500e7344a9760ed24398c7305dca27 Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 27 Sep 2024 13:59:09 +0100 Subject: [PATCH 3/5] Update action/andstor/file-existence-action to v3 --- .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 a5aaeb022..0acf4bf23 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -103,7 +103,7 @@ jobs: ls /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions - name: Check boot_app0 file existence (esp32sx built from core, not-source) id: check_files - uses: andstor/file-existence-action@v2 + uses: andstor/file-existence-action@v3 with: files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin" - name: boot_app0 file from arduino-cli core @@ -298,7 +298,7 @@ jobs: mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin - name: Check boot_app0 file existence (esp32 built from core, not-source) id: check_files - uses: andstor/file-existence-action@v2 + uses: andstor/file-existence-action@v3 with: files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin" - name: boot_app0 file from arduino-cli core @@ -687,7 +687,7 @@ jobs: mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin - name: Check boot_app0 file existence (esp32 built from core, not-source) id: check_files - uses: andstor/file-existence-action@v2 + uses: andstor/file-existence-action@v3 with: files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin" - name: boot_app0 file from arduino-cli core From 7b51b5a41ed6b30dc78fbf4292d8f952223b0f0c Mon Sep 17 00:00:00 2001 From: tyeth Date: Fri, 27 Sep 2024 14:07:14 +0100 Subject: [PATCH 4/5] fix one name + shorten SAMD-no-fs --- .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 0acf4bf23..de063ce52 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -452,7 +452,7 @@ jobs: # NOTE: This does NOT release artifacts, it only builds build-samd-non-fs: - name: 🏗️SAMD (NO-TINYUSB) + name: 🏗️SAMD🚫💽 runs-on: ubuntu-latest strategy: fail-fast: false @@ -548,7 +548,7 @@ jobs: wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip build-esp32sx-dev: - name: 🏗️ESP32-Sx(DEV)) + name: 🏗️ESP32-Sx(DEV) runs-on: ubuntu-latest strategy: fail-fast: false From 96af0e0a20d1afe94dab28f0ad7b749e1a565da9 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Thu, 10 Oct 2024 17:19:06 +0100 Subject: [PATCH 5/5] Update build-clang-doxy.yml --- .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 de063ce52..451cda4d5 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -452,7 +452,7 @@ jobs: # NOTE: This does NOT release artifacts, it only builds build-samd-non-fs: - name: 🏗️SAMD🚫💽 + name: 🏗️SAMD🚫⧾🔱 runs-on: ubuntu-latest strategy: fail-fast: false