Skip to content

Commit

Permalink
Merge branch 'refs/heads/pr/actions-fork-sync-001' into dev-local-202406
Browse files Browse the repository at this point in the history
* refs/heads/pr/actions-fork-sync-001:
  ci: auto Sync Fork
  • Loading branch information
bluelovers committed Jun 9, 2024
2 parents 017f5eb + cf690ed commit 76474d3
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/fork-sync-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Sync Fork

on:
push:
branches:
- dev-bluelovers
schedule:
- cron: '* * 1 * *'
- cron: '* * 15 * *'
workflow_dispatch: # on button click

jobs:
sync:

runs-on: ubuntu-latest

steps:
- uses: tgymnich/fork-sync@v2
with:
token: ${{ secrets.All2024_TOKEN }}
owner: AUTOMATIC1111
base: dev
head: dev-bluelovers
merge_method: rebase
28 changes: 28 additions & 0 deletions .github/workflows/fork-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Sync Fork

on:
schedule:
- cron: '* * 1 * *'
- cron: '* * 15 * *'
workflow_dispatch: # on button click

jobs:
sync:

runs-on: ubuntu-latest

steps:
- uses: tgymnich/fork-sync@v2
with:
token: ${{ secrets.All2024_TOKEN }}
owner: AUTOMATIC1111
base: master
head: master
merge_method: rebase
- uses: tgymnich/fork-sync@v2
with:
token: ${{ secrets.All2024_TOKEN }}
owner: AUTOMATIC1111
base: dev
head: dev
merge_method: rebase

0 comments on commit 76474d3

Please sign in to comment.