apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

.github: fix workflow settings and allow branch pushes to main by committers (#6225)

Browse Source 
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 <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2022-04-07 13:49:03 +05:30 committed by GitHub
parent 1500e1f70c
commit 2b1c4fbe6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.asf.yaml
View File

@ -46,7 +46,4 @@ github:
collaborators: collaborators:
- acs-robot - acs-robot
#protected_branches: protected_branches: ~
# main:
# required_pull_request_reviews:
# required_approving_review_count: 2

8
.github/workflows/merge-conflict-checker.yml vendored
View File

@ -18,12 +18,8 @@
name: "Check Pull Requests Conflict" name: "Check Pull Requests Conflict"
on: on:
push: push:
branches: pull_request_target:
- main
pull_request:
types: [synchronize] types: [synchronize]
branches:
- main
jobs: jobs:
triage: triage:
@ -36,4 +32,4 @@ jobs:
dirtyLabel: "status:has-conflicts" dirtyLabel: "status:has-conflicts"
removeOnDirtyLabel: "status:ready-for-review" removeOnDirtyLabel: "status:ready-for-review"
continueOnMissingPermissions: true 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?"