You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/04/06 18:23:01 UTC
[cloudstack] branch main updated: .github: add merge conflict checker per RM request (#6221)
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 1500e1f70c .github: add merge conflict checker per RM request (#6221)
1500e1f70c is described below
commit 1500e1f70c682ccf36a9d4bbfe7027bf74af9782
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Apr 6 23:52:55 2022 +0530
.github: add merge conflict checker per RM request (#6221)
* .github: add merge conflict checker per RM request
Adds a merge conflict checker workflow per current RM (Nicolas's)
request.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
* Update merge-conflict-checker.yml
* Update merge-conflict-checker.yml
---
.github/workflows/merge-conflict-checker.yml | 39 ++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml
new file mode 100644
index 0000000000..3f47c63093
--- /dev/null
+++ b/.github/workflows/merge-conflict-checker.yml
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: "Check Pull Requests Conflict"
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ types: [synchronize]
+ branches:
+ - main
+
+jobs:
+ triage:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check Pull Requests Conflict
+ uses: eps1lon/actions-label-merge-conflict@v2.0.0
+ with:
+ repoToken: "${{ secrets.GITHUB_TOKEN }}"
+ 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?"