Skip to content

Commit

Permalink
fix: automerge action (#213)
Browse files Browse the repository at this point in the history
* fix: automerge action

* limit branches
  • Loading branch information
stehessel authored Mar 6, 2024
1 parent b3db632 commit 6900ed2
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 6 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: automerge
on:
pull_request:
branches:
- stage
- production
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- id: automerge
name: automerge
uses: "pascalgn/automerge-action@v0.16.2"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: merge
MERGE_FILTER_AUTHOR: github-actions
5 changes: 2 additions & 3 deletions .github/workflows/sync-prod-from-stage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ jobs:
uses: actions/checkout@v4
- name: Opening pull request
id: pull
# We need main for PULL_REQUEST_AUTO_MERGE_METHOD, which is currently not yet released.
uses: tretuna/sync-branches@main
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "stage"
TO_BRANCH: "production"
PULL_REQUEST_AUTO_MERGE_METHOD: merge
LABELS: automerge
5 changes: 2 additions & 3 deletions .github/workflows/sync-stage-from-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ jobs:
uses: actions/checkout@v4
- name: Opening pull request
id: pull
# We need main for PULL_REQUEST_AUTO_MERGE_METHOD, which is currently not yet released.
uses: tretuna/sync-branches@main
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "master"
TO_BRANCH: "stage"
PULL_REQUEST_AUTO_MERGE_METHOD: merge
LABELS: automerge

0 comments on commit 6900ed2

Please sign in to comment.