Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Run CI on merge queue groups without publishing images

Matt Roberts7f9c43f5b8ca
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b83f097f2..54844db3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ on:
pull_request:
branches:
- main
+ merge_group:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
@@ -129,7 +130,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- browser: ${{ github.event_name == 'pull_request' && fromJSON('["chromium"]') || fromJSON('["chromium","webkit","firefox"]') }}
+ browser: ${{ (github.event_name == 'pull_request' || github.event_name == 'merge_group') && fromJSON('["chromium"]') || fromJSON('["chromium","webkit","firefox"]') }}
steps:
- uses: actions/checkout@v7
- name: Use Node.js 22.x
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index eb3643bb9..9a7430607 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,9 +11,10 @@ jobs:
runs-on: ubuntu-latest
# Skip fork PRs: checkout refuses fork code in a trusted workflow_run context (pwn-request
# guard), and this job holds Docker Hub secrets. Fork PR images can be published on demand via
- # publish-pr-multiarch.yml after review.
+ # publish-pr-multiarch.yml after review. Skip merge queue runs: nothing should be published.
if: >-
${{ github.event.workflow_run.conclusion == 'success' &&
+ github.event.workflow_run.event != 'merge_group' &&
(github.event.workflow_run.event != 'pull_request' ||
github.event.workflow_run.head_repository.full_name == github.repository) }}
steps: