Skip to content

Commit d01e5d7

Browse files
tyethtyeth
authored
Merge pull request #642 from adafruit/add-merge-to-fix-upload-download-artifact-v4
Add merge to fix upload download artifact v4
2 parents 9e9a19b + 96af0e0 commit d01e5d7

File tree

1 file changed

+49
-23
lines changed

1 file changed

+49
-23
lines changed

‎.github/workflows/build-clang-doxy.yml‎

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
build-esp32sx-esptool:
16-
name: Build ESP32-Sx
16+
name: 🏗️ESP32-Sx(lvgl)
1717
runs-on: ubuntu-latest
1818
strategy:
1919
fail-fast: false
@@ -22,7 +22,7 @@ jobs:
2222
include:
2323
- offset: "0x1000"
2424
steps:
25-
- uses: actions/setup-python@v4
25+
- uses: actions/setup-python@v5
2626
with:
2727
python-version: "3.x"
2828
- uses: actions/checkout@v4
@@ -103,7 +103,7 @@ jobs:
103103
ls /home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions
104104
- name: Check boot_app0 file existence (esp32sx built from core, not-source)
105105
id: check_files
106-
uses: andstor/file-existence-action@v2
106+
uses: andstor/file-existence-action@v3
107107
with:
108108
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
109109
- name: boot_app0 file from arduino-cli core
@@ -145,7 +145,7 @@ jobs:
145145
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
146146
147147
build-esp32sx:
148-
name: Build ESP32-Sx
148+
name: 🏗️ESP32-Sx
149149
runs-on: ubuntu-latest
150150
strategy:
151151
fail-fast: false
@@ -166,7 +166,7 @@ jobs:
166166
"qtpy_esp32s3_n4r2",
167167
]
168168
steps:
169-
- uses: actions/setup-python@v4
169+
- uses: actions/setup-python@v5
170170
with:
171171
python-version: "3.x"
172172
- uses: actions/checkout@v4
@@ -227,7 +227,7 @@ jobs:
227227
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
228228
229229
build-esp32:
230-
name: Build ESP32 and Cx
230+
name: 🏗️ESP32/Cx
231231
runs-on: ubuntu-latest
232232
strategy:
233233
fail-fast: false
@@ -248,7 +248,7 @@ jobs:
248248
- offset: "0x0"
249249
arduino-platform: "wippersnapper_feather_esp32c6"
250250
steps:
251-
- uses: actions/setup-python@v4
251+
- uses: actions/setup-python@v5
252252
with:
253253
python-version: "3.x"
254254
- uses: actions/checkout@v4
@@ -298,7 +298,7 @@ jobs:
298298
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
299299
- name: Check boot_app0 file existence (esp32 built from core, not-source)
300300
id: check_files
301-
uses: andstor/file-existence-action@v2
301+
uses: andstor/file-existence-action@v3
302302
with:
303303
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
304304
- name: boot_app0 file from arduino-cli core
@@ -345,7 +345,7 @@ jobs:
345345
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
346346
347347
build-samd:
348-
name: Build WipperSnapper SAMD
348+
name: 🏗️SAMD
349349
runs-on: ubuntu-latest
350350
strategy:
351351
fail-fast: false
@@ -357,7 +357,7 @@ jobs:
357357
"metro_m4_airliftlite_tinyusb",
358358
]
359359
steps:
360-
- uses: actions/setup-python@v4
360+
- uses: actions/setup-python@v5
361361
with:
362362
python-version: "3.x"
363363
- uses: actions/checkout@v4
@@ -402,14 +402,14 @@ jobs:
402402
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex
403403
404404
build-rp2040:
405-
name: Build WipperSnapper RP2040
405+
name: 🏗️RP2040
406406
runs-on: ubuntu-latest
407407
strategy:
408408
fail-fast: false
409409
matrix:
410410
arduino-platform: ["picow_rp2040_tinyusb"]
411411
steps:
412-
- uses: actions/setup-python@v4
412+
- uses: actions/setup-python@v5
413413
with:
414414
python-version: "3.x"
415415
- uses: actions/checkout@v4
@@ -452,14 +452,14 @@ jobs:
452452
453453
# NOTE: This does NOT release artifacts, it only builds
454454
build-samd-non-fs:
455-
name: Build WipperSnapper SAMD (NO-TINYUSB)
455+
name: 🏗️SAMD🚫⧾🔱
456456
runs-on: ubuntu-latest
457457
strategy:
458458
fail-fast: false
459459
matrix:
460460
arduino-platform: ["mkrwifi1010", "nano_33_iot"]
461461
steps:
462-
- uses: actions/setup-python@v4
462+
- uses: actions/setup-python@v5
463463
with:
464464
python-version: "3.x"
465465
- uses: actions/checkout@v4
@@ -492,14 +492,14 @@ jobs:
492492
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
493493

494494
build-esp8266:
495-
name: Build WipperSnapper ESP8266
495+
name: 🏗️ESP8266
496496
runs-on: ubuntu-latest
497497
strategy:
498498
fail-fast: false
499499
matrix:
500500
arduino-platform: ["feather_esp8266"]
501501
steps:
502-
- uses: actions/setup-python@v4
502+
- uses: actions/setup-python@v5
503503
with:
504504
python-version: "3.x"
505505
- uses: actions/checkout@v4
@@ -548,7 +548,7 @@ jobs:
548548
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
549549
550550
build-esp32sx-dev:
551-
name: Build WipperSnapper ESP32-Sx DEV BUILDS
551+
name: 🏗️ESP32-Sx(DEV)
552552
runs-on: ubuntu-latest
553553
strategy:
554554
fail-fast: false
@@ -562,7 +562,7 @@ jobs:
562562
"feather_esp32s3_tft_debug",
563563
]
564564
steps:
565-
- uses: actions/setup-python@v4
565+
- uses: actions/setup-python@v5
566566
with:
567567
python-version: "3.x"
568568
- uses: actions/checkout@v4
@@ -623,7 +623,7 @@ jobs:
623623
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
624624
625625
build-esp32-dev:
626-
name: Build WipperSnapper ESP32/Cx DEV BUILDS
626+
name: 🏗️ESP32/Cx(DEV)
627627
runs-on: ubuntu-latest
628628
strategy:
629629
fail-fast: false
@@ -637,7 +637,7 @@ jobs:
637637
- offset: "0x0"
638638
arduino-platform: "wippersnapper_feather_esp32c6_debug"
639639
steps:
640-
- uses: actions/setup-python@v4
640+
- uses: actions/setup-python@v5
641641
with:
642642
python-version: "3.x"
643643
- uses: actions/checkout@v4
@@ -687,7 +687,7 @@ jobs:
687687
mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
688688
- name: Check boot_app0 file existence (esp32 built from core, not-source)
689689
id: check_files
690-
uses: andstor/file-existence-action@v2
690+
uses: andstor/file-existence-action@v3
691691
with:
692692
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
693693
- name: boot_app0 file from arduino-cli core
@@ -731,12 +731,38 @@ jobs:
731731
- name: upload build artifacts zip
732732
uses: actions/upload-artifact@v4
733733
with:
734-
name: build-files-dev
734+
name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
735735
path: |
736736
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
737737
738+
merge-job-build-files:
739+
name: Merge Artifacts for build-files
740+
runs-on: ubuntu-latest
741+
needs: [build-esp32sx-esptool, build-esp32sx, build-esp32, build-esp8266, build-samd, build-rp2040, build-samd-non-fs]
742+
743+
steps:
744+
- name: Merge Artifacts from Builds
745+
uses: actions/upload-artifact/merge@v4
746+
with:
747+
name: build-files
748+
pattern: build-files-!(dev)-*
749+
delete-merged: true
750+
751+
merge-job2:
752+
name: Merge Artifacts for build-files-dev
753+
runs-on: ubuntu-latest
754+
needs: [build-esp32sx-dev, build-esp32-dev]
755+
756+
steps:
757+
- name: Merge Artifacts from Dev Builds
758+
uses: actions/upload-artifact/merge@v4
759+
with:
760+
name: build-files-dev
761+
pattern: build-files-dev-*
762+
delete-merged: true
738763

739764
clang_and_doxy:
765+
name: 🔎Clang & Doxygen
740766
runs-on: ubuntu-latest
741767
needs:
742768
[
@@ -748,7 +774,7 @@ jobs:
748774
build-rp2040,
749775
]
750776
steps:
751-
- uses: actions/setup-python@v4
777+
- uses: actions/setup-python@v5
752778
with:
753779
python-version: "3.x"
754780
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)