Claudia/PluralFlux-infra
1
1
Fork 0
forked from PluralFlux/PluralFlux
Code Pull Requests Actions Packages Releases Activity

Update .gitea/workflows/sync-from-mirror.yaml
Some checks failed
nodeJS remote worker / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Claudia
2026-03-05 16:57:28 +11:00
parent 4d4bad5b80
commit 49cf7ef585
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitea/workflows/sync-from-mirror.yaml
View File

@@ -2,7 +2,7 @@ name: Auto-Sync from Mirror
on: on:
push: push:
repository: "Pluralflux/Pluralflux" repository: "Pluralflux/Pluralflux"
branches: [main,develop] branches: ["*"]
workflow_dispatch: workflow_dispatch:
@@ -20,7 +20,10 @@ jobs:
run: | run: |
git remote add upstream https://engineering.sanya.gay/PluralFlux/PluralFlux.git git remote add upstream https://engineering.sanya.gay/PluralFlux/PluralFlux.git
git fetch upstream --prune git fetch upstream --prune
git reset --hard origin/main git reset --hard origin/main
git push origin "refs/remotes/upstream/*:refs/heads/*" --force-with-lease
git merge upstream/main -m "Syncing from github" TARGET=${{ github.ref_name }}
git push origin main
git merge upstream/$TARGET -m "Syncing from github" --strategy-option ours
git push origin $TARGET