Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: move conflict wf to depot
Kyle Mendellc7e2e6a653d7
diff --git a/.github/workflows/merge-conflict.yml b/.depot/workflows/merge-conflict.ymlsimilarity index 71%rename from .github/workflows/merge-conflict.ymlrename to .depot/workflows/merge-conflict.ymlindex 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:+ - completedjobs:label:name: Labelingruns-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: readpull-requests: write