This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 2b1c4fbe6e .github: fix workflow settings and allow branch pushes to
main by committers (#6225)
2b1c4fbe6e is described below
commit 2b1c4fbe6e6ca8bb8fb6d44198aaa56ca393ffd6
Author: Rohit Yadav <[email protected]>
AuthorDate: Thu Apr 7 13:49:03 2022 +0530
.github: fix workflow settings and allow branch pushes to main by
committers (#6225)
This fixes the comment message for merge conflict checker and resets the
github branch protection for main in case of need by the RM.
Signed-off-by: Rohit Yadav <[email protected]>
---
.asf.yaml | 5 +----
.github/workflows/merge-conflict-checker.yml | 8 ++------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 4e674ffe1b..a0ba9155a5 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,7 +46,4 @@ github:
collaborators:
- acs-robot
- #protected_branches:
- # main:
- # required_pull_request_reviews:
- # required_approving_review_count: 2
+ protected_branches: ~
diff --git a/.github/workflows/merge-conflict-checker.yml
b/.github/workflows/merge-conflict-checker.yml
index 3f47c63093..363eaba097 100644
--- a/.github/workflows/merge-conflict-checker.yml
+++ b/.github/workflows/merge-conflict-checker.yml
@@ -18,12 +18,8 @@
name: "Check Pull Requests Conflict"
on:
push:
- branches:
- - main
- pull_request:
+ pull_request_target:
types: [synchronize]
- branches:
- - main
jobs:
triage:
@@ -36,4 +32,4 @@ jobs:
dirtyLabel: "status:has-conflicts"
removeOnDirtyLabel: "status:ready-for-review"
continueOnMissingPermissions: true
- commentOnDirty: "Hi @${author}, your pull request has merge conflicts.
Can you fix the conflicts and sync your branch with the base branch?"
+ commentOnDirty: "Hi @${{ github.event.pull_request.user.login }}, your
pull request has merge conflicts. Can you fix the conflicts and sync your
branch with the base branch?"
