From 2f07af63f50c7db714ad4ca174ce5867b0499cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Tue, 13 Aug 2024 11:04:19 +0200 Subject: [PATCH] ci: enable merge groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 71c751d..a10f32d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,11 +1,12 @@ name: Publish on: - pull_request: push: branches: - main workflow_dispatch: + pull_request: + merge_group: jobs: docker: @@ -14,12 +15,12 @@ jobs: steps: - uses: docker/setup-buildx-action@v3 - uses: docker/login-action@v3 - if: github.event_name != 'pull_request' + if: github.ref_name == 'main' with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - uses: docker/build-push-action@v5 with: - push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.ref_name == 'main' }} tags: ghcr.io/hermit-os/hermit-toolchain:latest