Skip to content

Commit 0a18357

Browse files
authored
Merge pull request #988 from meshtastic/ci/merge-queue
Run CI and the container build on merge_group events
2 parents 77c2965 + 63b61a2 commit 0a18357

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
branches:
1111
- master
12+
merge_group:
1213

1314
jobs:
1415
validate:

‎.github/workflows/container-build.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
branches:
1111
- master
12+
merge_group:
1213

1314
env:
1415
REGISTRY: ghcr.io
@@ -42,7 +43,7 @@ jobs:
4243
uses: docker/setup-buildx-action@v3
4344

4445
- name: Login to Container registry
45-
if: github.event_name != 'pull_request'
46+
if: github.event_name == 'push'
4647
uses: docker/login-action@v3
4748
with:
4849
registry: ${{ env.REGISTRY }}
@@ -72,7 +73,7 @@ jobs:
7273
platforms: linux/amd64,linux/arm64
7374
context: .
7475
file: ${{ matrix.container }}
75-
push: ${{ github.event_name != 'pull_request' }}
76+
push: ${{ github.event_name == 'push' }}
7677
tags: ${{ steps.meta.outputs.tags }}
7778
labels: ${{ steps.meta.outputs.labels }}
7879
cache-from: type=gha

0 commit comments

Comments
 (0)