Skip to content

Modern Docker Management, Designed for Everyone

chore: move conflict wf to depot

Kyle Mendellc7e2e6a653d7
diff --git a/.github/workflows/merge-conflict.yml b/.depot/workflows/merge-conflict.yml
similarity index 71%
rename from .github/workflows/merge-conflict.yml
rename to .depot/workflows/merge-conflict.yml
index 75b9c8904..41d16414b 100644
--- a/.github/workflows/merge-conflict.yml
+++ b/.depot/workflows/merge-conflict.yml
@@ -4,16 +4,17 @@ on:
push:
branches:
- main
- pull_request_target:
- branches:
- - main
- types: [synchronize]
+ workflow_run:
+ workflows:
+ - CI
+ types:
+ - completed
jobs:
label:
name: Labeling
runs-on: depot-ubuntu-latest
- if: ${{ github.repository == 'getarcaneapp/arcane' }}
+ if: ${{ github.repository == 'getarcaneapp/arcane' && (github.event_name == 'push' || github.event.workflow_run.event == 'pull_request') }}
permissions:
contents: read
pull-requests: write