mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
5743972a26
- Extract merge conflicts check to its own workflow, plus make it run on push - Add issues update as Done or Done staging based on extracted commit messages
25 lines
786 B
YAML
25 lines
786 B
YAML
name: 🎯 Push Handler
|
|
|
|
on:
|
|
# So that PRs touching the same files as the push are updated
|
|
push:
|
|
# So that the `dirtyLabel` is removed if conflicts are resolved
|
|
pull_request_target:
|
|
types: [synchronize]
|
|
|
|
jobs:
|
|
check-merge-conflicts:
|
|
name: Check Merge Conflicts
|
|
runs-on: ubuntu-latest
|
|
|
|
steps:
|
|
- name: Check Merge Conflicts
|
|
# Label Conflicting Pull Requests
|
|
# https://github.com/marketplace/actions/label-conflicting-pull-requests
|
|
uses: eps1lon/actions-label-merge-conflict@v3
|
|
with:
|
|
dirtyLabel: '🚫 Merge Conflicts'
|
|
repoToken: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
|
|
commentOnDirty: >
|
|
⚠️ This PR has conflicts that need to be resolved before it can be merged.
|