This commit is contained in:
Dane Evans 2025-08-01 18:06:44 +10:00 committed by Tom Fifield
parent ea1d968777
commit 590db89643

View File

@ -1,4 +1,3 @@
name: Merge Queue name: Merge Queue
# Not sure how concurrency works in merge_queue, removing for now. # Not sure how concurrency works in merge_queue, removing for now.
# concurrency: # concurrency:
@ -11,7 +10,6 @@ on:
env: env:
FAIL_FAST_PER_ARCH: true FAIL_FAST_PER_ARCH: true
jobs: jobs:
setup: setup:
strategy: strategy:
@ -90,7 +88,7 @@ jobs:
build-esp32: build-esp32:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.esp32) }} matrix: ${{ fromJson(needs.setup.outputs.esp32) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -101,7 +99,7 @@ jobs:
build-esp32s3: build-esp32s3:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.esp32s3) }} matrix: ${{ fromJson(needs.setup.outputs.esp32s3) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -112,7 +110,7 @@ jobs:
build-esp32c3: build-esp32c3:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.esp32c3) }} matrix: ${{ fromJson(needs.setup.outputs.esp32c3) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -123,7 +121,7 @@ jobs:
build-esp32c6: build-esp32c6:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }} matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -134,7 +132,7 @@ jobs:
build-nrf52840: build-nrf52840:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.nrf52840) }} matrix: ${{ fromJson(needs.setup.outputs.nrf52840) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -145,7 +143,7 @@ jobs:
build-rp2040: build-rp2040:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.rp2040) }} matrix: ${{ fromJson(needs.setup.outputs.rp2040) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -156,7 +154,7 @@ jobs:
build-rp2350: build-rp2350:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.rp2350) }} matrix: ${{ fromJson(needs.setup.outputs.rp2350) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with:
@ -167,7 +165,7 @@ jobs:
build-stm32: build-stm32:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH == true }}
matrix: ${{ fromJson(needs.setup.outputs.stm32) }} matrix: ${{ fromJson(needs.setup.outputs.stm32) }}
uses: ./.github/workflows/build_firmware.yml uses: ./.github/workflows/build_firmware.yml
with: with: