From a20bd6e5ccd041b3c36c00fc44d77f9d93b99b87 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 6 Apr 2022 23:08:09 +0530 Subject: [PATCH 1/3] .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 --- .github/workflows/merge-conflict-checker.yml | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/merge-conflict-checker.yml diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml new file mode 100644 index 000000000000..d3462100c2e3 --- /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: "PullRequestConflictChecker" +on: + push: + branches: + - main + pull_request: + types: [synchronize] + branches: + - main + +jobs: + triage: + runs-on: ubuntu-latest + steps: + - name: Check Conflicting Pull Requests + 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?" From 5b89f6a917f14af7a0614509b20859c738aeb6a0 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 6 Apr 2022 23:30:58 +0530 Subject: [PATCH 2/3] Update merge-conflict-checker.yml --- .github/workflows/merge-conflict-checker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index d3462100c2e3..f6a35fd9a847 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -29,7 +29,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - name: Check Conflicting Pull Requests + - name: Check Pull Request Conflict uses: eps1lon/actions-label-merge-conflict@v2.0.0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}" From eeb0e386f48e769ca192ccdd0b8b7d079b0e28c8 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 6 Apr 2022 23:31:56 +0530 Subject: [PATCH 3/3] Update merge-conflict-checker.yml --- .github/workflows/merge-conflict-checker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-conflict-checker.yml b/.github/workflows/merge-conflict-checker.yml index f6a35fd9a847..3f47c6309326 100644 --- a/.github/workflows/merge-conflict-checker.yml +++ b/.github/workflows/merge-conflict-checker.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -name: "PullRequestConflictChecker" +name: "Check Pull Requests Conflict" on: push: branches: @@ -29,7 +29,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - name: Check Pull Request Conflict + - name: Check Pull Requests Conflict uses: eps1lon/actions-label-merge-conflict@v2.0.0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}"