Update .gitea/workflows/sync-upstream.yaml
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
name: Sync Upstream Bluesky
|
name: Sync Upstream Bluesky
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 */8 * * *'
|
- cron: '0 */8 * * *'
|
||||||
@@ -14,17 +15,18 @@ jobs:
|
|||||||
ref: main
|
ref: main
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Add upstream remote
|
- name: Configure Git Identity
|
||||||
run: git remote add upstream https://github.com/bluesky-social/social-app.git
|
|
||||||
|
|
||||||
- name: Fetch upstream
|
|
||||||
run: git fetch upstream
|
|
||||||
|
|
||||||
- name: Merge upstream changes
|
|
||||||
run: |
|
run: |
|
||||||
git config user.name "gitea-actions-bot"
|
git config user.name "gitea-actions-bot"
|
||||||
git config user.email "toaster+git@proot.uk"
|
git config user.email "toaster+git@proot.uk"
|
||||||
git merge upstream/main --no-edit
|
|
||||||
|
|
||||||
- name: Push to origin
|
- name: Add Upstream Remote
|
||||||
run: git push origin main
|
run: git remote add upstream https://github.com/bluesky-social/social-app.git
|
||||||
|
|
||||||
|
- name: Fetch Upstream
|
||||||
|
run: git fetch upstream
|
||||||
|
|
||||||
|
- name: Merge and Push
|
||||||
|
run: |
|
||||||
|
git merge upstream/main --no-edit
|
||||||
|
git push origin main
|
||||||
Reference in New Issue
Block a user