Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto merge configuration updated in GitHub workflow #332

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Auto merge configuration updated in GitHub workflow #332

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9458b5a
fix: changed automerge eveent
zubairshakoorarbisoft Dec 21, 2022
5ebd2d3
fix: check suit completed check addedd for automerge
zubairshakoorarbisoft Dec 22, 2022
eba416e
fix: ready to merge label requirements removed
zubairshakoorarbisoft Dec 22, 2022
db24953
fix: merge configs updated
zubairshakoorarbisoft Dec 22, 2022
e531094
fix: added success conclusion for triggering once sutomerge
zubairshakoorarbisoft Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,19 @@
name: automerge

on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
conclusion: success

jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/automerge-action@v0.8.3"
uses: "pascalgn/automerge-action@v0.14.3"
env:
GITHUB_TOKEN: "${{ github.token }}"
MERGE_LABELS: "Ready to Merge"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you removing this line? We only want to auto-merge upgrade PRs, if this label exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because, my iski testing manual PR bna k kr tha tha.. but at the end add to hoga e

MERGE_RETRIES: "10"
MERGE_RETRY_SLEEP: "5000"
MERGE_REQUIRED_APPROVALS: "0"
MERGE_COMMIT_MESSAGE: pull-request-title
MERGE_METHOD: "rebase"