Skip to content

Commit 901e2a4

Browse files
tyethtyeth
authored
Merge pull request #631 from adafruit/fix-upload-download-artifact
Update Depreciated Workflow Action
2 parents 6e49411 + d01e5d7 commit 901e2a4

File tree

2 files changed

+70
-44
lines changed

2 files changed

+70
-44
lines changed

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

Lines changed: 68 additions & 42 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
@@ -100,7 +100,7 @@ jobs:
100100
} >> "$GITHUB_OUTPUT"
101101
- name: Check boot_app0 file existence (esp32sx built from core, not-source)
102102
id: check_files
103-
uses: andstor/file-existence-action@v2
103+
uses: andstor/file-existence-action@v3
104104
with:
105105
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
106106
- name: list arduino esp32 core files
@@ -133,24 +133,24 @@ jobs:
133133
- name: Zip build artifacts
134134
run: |
135135
zip -r wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.*
136-
- name: upload build artifacts zip
137-
uses: actions/upload-artifact@v3
136+
- name: Upload build artifacts zip
137+
uses: actions/upload-artifact@v4
138138
with:
139-
name: build-files
139+
name: build-files-${{ matrix.arduino-platform }}-zip
140140
path: |
141141
wippersnapper.${{ matrix.arduino-platform }}.fatfs.${{ env.WS_VERSION }}.zip
142142
- name: Rename build artifacts to reflect the platform name
143143
run: |
144144
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
145-
- name: upload build artifacts
146-
uses: actions/upload-artifact@v3
145+
- name: Upload build artifact UF2 file
146+
uses: actions/upload-artifact@v4
147147
with:
148-
name: build-files
148+
name: build-files-${{ matrix.arduino-platform }}-uf2
149149
path: |
150150
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
151151
152152
build-esp32sx:
153-
name: Build ESP32-Sx
153+
name: 🏗️ESP32-Sx
154154
runs-on: ubuntu-latest
155155
strategy:
156156
fail-fast: false
@@ -171,7 +171,7 @@ jobs:
171171
"qtpy_esp32s3_n4r2",
172172
]
173173
steps:
174-
- uses: actions/setup-python@v4
174+
- uses: actions/setup-python@v5
175175
with:
176176
python-version: "3.x"
177177
- uses: actions/checkout@v4
@@ -224,15 +224,15 @@ jobs:
224224
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
225225
mv examples/*/build/*/Wippersnapper_demo.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
226226
- name: upload build artifacts
227-
uses: actions/upload-artifact@v3
227+
uses: actions/upload-artifact@v4
228228
with:
229-
name: build-files
229+
name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
230230
path: |
231231
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
232232
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
233233
234234
build-esp32:
235-
name: Build ESP32 and Cx
235+
name: 🏗️ESP32/Cx
236236
runs-on: ubuntu-latest
237237
strategy:
238238
fail-fast: false
@@ -253,7 +253,7 @@ jobs:
253253
- offset: "0x0"
254254
arduino-platform: "wippersnapper_feather_esp32c6"
255255
steps:
256-
- uses: actions/setup-python@v4
256+
- uses: actions/setup-python@v5
257257
with:
258258
python-version: "3.x"
259259
- uses: actions/checkout@v4
@@ -303,7 +303,7 @@ jobs:
303303
mv examples/Wippersnapper_demo/build/*/Wippersnapper_demo.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
304304
- name: Check boot_app0 file existence (esp32 built from core, not-source)
305305
id: check_files
306-
uses: andstor/file-existence-action@v2
306+
uses: andstor/file-existence-action@v3
307307
with:
308308
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
309309
- name: boot_app0 file from arduino-cli core
@@ -343,14 +343,14 @@ jobs:
343343
run: |
344344
zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
345345
- name: upload build artifacts zip
346-
uses: actions/upload-artifact@v3
346+
uses: actions/upload-artifact@v4
347347
with:
348-
name: build-files
348+
name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
349349
path: |
350350
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
351351
352352
build-samd:
353-
name: Build WipperSnapper SAMD
353+
name: 🏗️SAMD
354354
runs-on: ubuntu-latest
355355
strategy:
356356
fail-fast: false
@@ -362,7 +362,7 @@ jobs:
362362
"metro_m4_airliftlite_tinyusb",
363363
]
364364
steps:
365-
- uses: actions/setup-python@v4
365+
- uses: actions/setup-python@v5
366366
with:
367367
python-version: "3.x"
368368
- uses: actions/checkout@v4
@@ -399,22 +399,22 @@ jobs:
399399
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
400400
mv examples/*/build/*/Wippersnapper_demo.ino.hex wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex
401401
- name: upload build artifacts
402-
uses: actions/upload-artifact@v3
402+
uses: actions/upload-artifact@v4
403403
with:
404-
name: build-files
404+
name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
405405
path: |
406406
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
407407
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.hex
408408
409409
build-rp2040:
410-
name: Build WipperSnapper RP2040
410+
name: 🏗️RP2040
411411
runs-on: ubuntu-latest
412412
strategy:
413413
fail-fast: false
414414
matrix:
415415
arduino-platform: ["picow_rp2040_tinyusb"]
416416
steps:
417-
- uses: actions/setup-python@v4
417+
- uses: actions/setup-python@v5
418418
with:
419419
python-version: "3.x"
420420
- uses: actions/checkout@v4
@@ -449,22 +449,22 @@ jobs:
449449
run: |
450450
mv examples/*/build/*/Wippersnapper_demo.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
451451
- name: upload build artifacts
452-
uses: actions/upload-artifact@v3
452+
uses: actions/upload-artifact@v4
453453
with:
454-
name: build-files
454+
name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
455455
path: |
456456
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
457457
458458
# NOTE: This does NOT release artifacts, it only builds
459459
build-samd-non-fs:
460-
name: Build WipperSnapper SAMD (NO-TINYUSB)
460+
name: 🏗️SAMD🚫⧾🔱
461461
runs-on: ubuntu-latest
462462
strategy:
463463
fail-fast: false
464464
matrix:
465465
arduino-platform: ["mkrwifi1010", "nano_33_iot"]
466466
steps:
467-
- uses: actions/setup-python@v4
467+
- uses: actions/setup-python@v5
468468
with:
469469
python-version: "3.x"
470470
- uses: actions/checkout@v4
@@ -497,14 +497,14 @@ jobs:
497497
run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000
498498

499499
build-esp8266:
500-
name: Build WipperSnapper ESP8266
500+
name: 🏗️ESP8266
501501
runs-on: ubuntu-latest
502502
strategy:
503503
fail-fast: false
504504
matrix:
505505
arduino-platform: ["feather_esp8266"]
506506
steps:
507-
- uses: actions/setup-python@v4
507+
- uses: actions/setup-python@v5
508508
with:
509509
python-version: "3.x"
510510
- uses: actions/checkout@v4
@@ -546,14 +546,14 @@ jobs:
546546
run: |
547547
zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
548548
- name: upload build artifacts zip
549-
uses: actions/upload-artifact@v3
549+
uses: actions/upload-artifact@v4
550550
with:
551-
name: build-files
551+
name: build-files-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
552552
path: |
553553
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
554554
555555
build-esp32sx-dev:
556-
name: Build WipperSnapper ESP32-Sx DEV BUILDS
556+
name: 🏗️ESP32-Sx(DEV)
557557
runs-on: ubuntu-latest
558558
strategy:
559559
fail-fast: false
@@ -567,7 +567,7 @@ jobs:
567567
"feather_esp32s3_tft_debug",
568568
]
569569
steps:
570-
- uses: actions/setup-python@v4
570+
- uses: actions/setup-python@v5
571571
with:
572572
python-version: "3.x"
573573
- uses: actions/checkout@v4
@@ -620,15 +620,15 @@ jobs:
620620
mv examples/*/build/*/wippersnapper_debug.ino.uf2 wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
621621
mv examples/*/build/*/wippersnapper_debug.ino.bin wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
622622
- name: upload build artifacts
623-
uses: actions/upload-artifact@v3
623+
uses: actions/upload-artifact@v4
624624
with:
625-
name: build-files-dev
625+
name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
626626
path: |
627627
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.uf2
628628
wippersnapper.${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}.bin
629629
630630
build-esp32-dev:
631-
name: Build WipperSnapper ESP32/Cx DEV BUILDS
631+
name: 🏗️ESP32/Cx(DEV)
632632
runs-on: ubuntu-latest
633633
strategy:
634634
fail-fast: false
@@ -642,7 +642,7 @@ jobs:
642642
- offset: "0x0"
643643
arduino-platform: "wippersnapper_feather_esp32c6_debug"
644644
steps:
645-
- uses: actions/setup-python@v4
645+
- uses: actions/setup-python@v5
646646
with:
647647
python-version: "3.x"
648648
- uses: actions/checkout@v4
@@ -692,7 +692,7 @@ jobs:
692692
mv examples/wippersnapper_debug/build/*/wippersnapper_debug.ino.partitions.bin wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin
693693
- name: Check boot_app0 file existence (esp32 built from core, not-source)
694694
id: check_files
695-
uses: andstor/file-existence-action@v2
695+
uses: andstor/file-existence-action@v3
696696
with:
697697
files: "/home/runner/.arduino15/packages/esp32/hardware/esp32/*/tools/partitions/boot_app0.bin"
698698
- name: boot_app0 file from arduino-cli core
@@ -734,14 +734,40 @@ jobs:
734734
run: |
735735
zip -r wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.*
736736
- name: upload build artifacts zip
737-
uses: actions/upload-artifact@v3
737+
uses: actions/upload-artifact@v4
738738
with:
739-
name: build-files-dev
739+
name: build-files-dev-${{ matrix.arduino-platform }}.${{ env.WS_VERSION }}
740740
path: |
741741
wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.zip
742742
743+
merge-job-build-files:
744+
name: Merge Artifacts for build-files
745+
runs-on: ubuntu-latest
746+
needs: [build-esp32sx-esptool, build-esp32sx, build-esp32, build-esp8266, build-samd, build-rp2040, build-samd-non-fs]
747+
748+
steps:
749+
- name: Merge Artifacts from Builds
750+
uses: actions/upload-artifact/merge@v4
751+
with:
752+
name: build-files
753+
pattern: build-files-!(dev)-*
754+
delete-merged: true
755+
756+
merge-job2:
757+
name: Merge Artifacts for build-files-dev
758+
runs-on: ubuntu-latest
759+
needs: [build-esp32sx-dev, build-esp32-dev]
760+
761+
steps:
762+
- name: Merge Artifacts from Dev Builds
763+
uses: actions/upload-artifact/merge@v4
764+
with:
765+
name: build-files-dev
766+
pattern: build-files-dev-*
767+
delete-merged: true
743768

744769
clang_and_doxy:
770+
name: 🔎Clang & Doxygen
745771
runs-on: ubuntu-latest
746772
needs:
747773
[
@@ -753,7 +779,7 @@ jobs:
753779
build-rp2040,
754780
]
755781
steps:
756-
- uses: actions/setup-python@v4
782+
- uses: actions/setup-python@v5
757783
with:
758784
python-version: "3.x"
759785
- uses: actions/checkout@v4

‎.github/workflows/release-callee.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Download build artifacts from build-platform steps
15-
uses: actions/download-artifact@v3
15+
uses: actions/download-artifact@v4
1616
with:
17-
name: build-files
17+
path: .
1818
- name: List Files
1919
run: ls
2020
- name: Upload Assets to the GitHub Release

0 commit comments

Comments
 (0)