aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2023-12-20 17:25:48 +0100
committerGitHub <noreply@github.com>2023-12-20 17:25:48 +0100
commitb73fee21e2ba5294b5820d2baa35bde7f2961c6c (patch)
treebe996a9c43c1b9d6d3100566ea98caab62fea8ce
parent9e8bcb16ad67e1339d51bacbe715121dbefcbcbb (diff)
downloadFlightCore-b73fee21e2ba5294b5820d2baa35bde7f2961c6c.tar.gz
FlightCore-b73fee21e2ba5294b5820d2baa35bde7f2961c6c.zip
ci: Add Action to add label to PR on merge conflict (#712)
Adds a GitHub Action that auto-adds a label to a PR in case there are merge conflicts.
-rw-r--r--.github/workflows/merge-conflict-auto-label.yml16
1 files changed, 16 insertions, 0 deletions
diff --git a/.github/workflows/merge-conflict-auto-label.yml b/.github/workflows/merge-conflict-auto-label.yml
new file mode 100644
index 00000000..e237726a
--- /dev/null
+++ b/.github/workflows/merge-conflict-auto-label.yml
@@ -0,0 +1,16 @@
+name: Merge Conflict Auto Label
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ triage:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: mschilde/auto-label-merge-conflicts@master
+ with:
+ CONFLICT_LABEL_NAME: "merge conflicts"
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ MAX_RETRIES: 5
+ WAIT_MS: 5000