rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02: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
parent 58ecc0dc0d d7a7af756a
commit a73cb9ad3d
2 changed files with 2 additions and 0 deletions
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 - staging
jobs: jobs:
check-conflicts: check-conflicts:
if: github.repository == 'SillyTavern/SillyTavern'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: mschilde/auto-label-merge-conflicts@master - uses: mschilde/auto-label-merge-conflicts@master

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

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