rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-12 09:26:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2154 from Bronya-Rand/staging

Browse Source 
chore: disable merge conflict workflow on forks
This commit is contained in:
Cohee 2024-04-28 14:50:28 +03:00 committed by GitHub
commit a73cb9ad3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/check-merge-conflicts.yml vendored
View File

@ -6,6 +6,7 @@ on:
- staging
jobs:
check-conflicts:
if: github.repository == 'SillyTavern/SillyTavern'
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@master

1
.github/workflows/docker-publish.yml vendored
View File

@ -21,6 +21,7 @@ env:
jobs:
build:
if: github.repository == 'SillyTavern/SillyTavern'
runs-on: ubuntu-latest
steps: