Skip to content

Commit

Permalink
Merge pull request #40 from hermit-os/merge_group
Browse files Browse the repository at this point in the history
ci: enable merge groups
  • Loading branch information
mkroening authored Aug 13, 2024
2 parents ee1311d + 2f07af6 commit 9d2cff2
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Publish

on:
pull_request:
push:
branches:
- master
- main
workflow_dispatch:
pull_request:
merge_group:

jobs:
docker:
Expand All @@ -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

0 comments on commit 9d2cff2

Please sign in to comment.