[ci] Run gitspiegel trigger with merge conflicts (#2531)

Currently gitspiegel trigger won't run if there is merge conflict. This
PR fixes it.

close https://github.com/paritytech/gitspiegel/issues/183
This commit is contained in:
Alexander Samusev
2023-11-28 21:07:40 +01:00
committed by GitHub
parent e71c484d5b
commit aada961da9
+11
View File
@@ -13,8 +13,19 @@ on:
- unlocked
- ready_for_review
- reopened
# the job doesn't check out any code, so it is relatively safe to run it on any event
pull_request_target:
types:
- opened
- synchronize
- unlocked
- ready_for_review
- reopened
merge_group:
# drop all permissions for GITHUB_TOKEN
permissions: {}
jobs:
sync:
runs-on: ubuntu-latest