Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merge to fix upload download artifact v4 #642

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 49 additions & 23 deletions .github/workflows/build-clang-doxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -402,14 +402,14 @@ 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
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
Expand Down Expand Up @@ -452,14 +452,14 @@ jobs:

# NOTE: This does NOT release artifacts, it only builds
build-samd-non-fs:
name: Build WipperSnapper SAMD (NO-TINYUSB)
name: 🏗️SAMD🚫⧾🔱
runs-on: ubuntu-latest
strategy:
fail-fast: false
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
Expand Down Expand Up @@ -492,14 +492,14 @@ 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
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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
[
Expand All @@ -748,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
Expand Down