This commit is contained in:
Dane Evans 2025-08-01 17:08:03 +10:00 committed by Tom Fifield
parent a7f63d5783
commit e39b56547e

View File

@ -1,8 +1,9 @@
name: Merge Queue name: Merge Queue
concurrency: # Not sure how concu
group: merge-queue-${{ github.head_ref || github.run_id }} # concurrency:
cancel-in-progress: true # group: merge-queue-${{ github.head_ref || github.run_id }}
# cancel-in-progress: true
on: on:
# Merge group is a special trigger that is used to trigger the workflow when a merge group is created. # Merge group is a special trigger that is used to trigger the workflow when a merge group is created.
merge_group: merge_group:
@ -89,7 +90,7 @@ jobs:
build-esp32: build-esp32:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -100,7 +101,7 @@ jobs:
build-esp32s3: build-esp32s3:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -111,7 +112,7 @@ jobs:
build-esp32c3: build-esp32c3:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -122,7 +123,7 @@ jobs:
build-esp32c6: build-esp32c6:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -133,7 +134,7 @@ jobs:
build-nrf52840: build-nrf52840:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -144,7 +145,7 @@ jobs:
build-rp2040: build-rp2040:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -155,7 +156,7 @@ jobs:
build-rp2350: build-rp2350:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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:
@ -166,7 +167,7 @@ jobs:
build-stm32: build-stm32:
needs: [setup, version] needs: [setup, version]
strategy: strategy:
fail-fast: ${{ env.FAIL_FAST_PER_ARCH }} fail-fast: ${{ vars.FAIL_FAST_PER_ARCH }}
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: