Skip to content

Commit 574ad66

Browse files
committed
Add merge steps + fix c6 dev asset name
1 parent 9e9a19b commit 574ad66

File tree

1 file changed

+36
-10
lines changed

1 file changed

+36
-10
lines changed

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

Lines changed: 36 additions & 10 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
@@ -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
@@ -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
@@ -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
@@ -402,7 +402,7 @@ 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
@@ -452,7 +452,7 @@ 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 (NO-TINYUSB)
456456
runs-on: ubuntu-latest
457457
strategy:
458458
fail-fast: false
@@ -492,7 +492,7 @@ 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
@@ -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
@@ -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
@@ -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
[

0 commit comments

Comments
 (0)