Skip to content

Commit 5eb82ab

Browse files
committed
attempt to use mergify instead.
1 parent ebcd971 commit 5eb82ab

File tree

2 files changed

+16
-43
lines changed

2 files changed

+16
-43
lines changed

.github/mergify.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# .github/mergify.yml
2+
pull_request_rules:
3+
- name: "Auto approve and merge PRs from master to azure-pipelines"
4+
conditions:
5+
- "base=azure-pipelines" # Target branch is azure-pipelines
6+
- "head=master" # Source branch is master
7+
actions:
8+
approve:
9+
# Approve the PR
10+
message: "Auto-approved because it's from master to azure-pipelines."
11+
merge:
12+
# Merge the PR once it's approved
13+
method: squash
14+
commit_message: "Sync master into azure-pipelines"
15+
merge_commit_message: "Automated PR to sync master into azure-pipelines"
16+
strict: false # Allow the merge to happen even if there are merge conflicts (optional)

.github/workflows/auto-merge-master-pr.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)