aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <gecko.eidechse+git@pm.me>2023-12-20 15:44:40 +0100
committerGeckoEidechse <gecko.eidechse+git@pm.me>2023-12-20 15:44:40 +0100
commitdd1806f585859b603393a87dd736c6b859187d25 (patch)
tree7c5ba68f5a728e48a0ba53b45a7d6666ced1b245
parent1e5c4a7f6a734352f802c82b293fe3b215e3a5b2 (diff)
downloadNorthstarLauncher-temp/test-conflict.tar.gz
NorthstarLauncher-temp/test-conflict.zip
temp: Test merge conflict label PRtemp/test-conflict
-rw-r--r--.github/workflows/merge-conflict-auto-label.yml17
1 files changed, 17 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..262c50c0
--- /dev/null
+++ b/.github/workflows/merge-conflict-auto-label.yml
@@ -0,0 +1,17 @@
+name: Merge Conflict Auto Label
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ triage:
+ runs-on: ubuntu-latest
+ steps:
+ - run: echo Hello
+ - uses: mschilde/auto-label-merge-conflicts@master
+ with:
+ CONFLICT_LABEL_NAME: "this is a test"
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ MAX_RETRIES: 5
+ WAIT_MS: 5000