zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update sync-branches.yml

Browse Source
This commit is contained in:
机械小鸽 2024-12-07 16:13:34 +08:00 committed by GitHub
parent 74dd1cb62d
commit 5fec55644f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/sync-branches.yml vendored
View File

@ -44,18 +44,20 @@ jobs:
run: | run: |
git branch -r | grep "origin/FrogPilot" && git push origin --delete FrogPilot || echo "No conflict with FrogPilot" git branch -r | grep "origin/FrogPilot" && git push origin --delete FrogPilot || echo "No conflict with FrogPilot"
- name: Create and push FrogPilot branch - name: Force fetch and reset FrogPilot branch from remote
run: | run: |
git checkout -b FrogPilot frogai/FrogPilot git fetch --all
git pull --rebase origin FrogPilot || echo "No changes to pull" git checkout --orphan FrogPilot
git push origin FrogPilot git reset --hard frogai/FrogPilot
git push origin FrogPilot --force
- name: Delete conflicting branch FrogPilot-Development if it exists - name: Delete conflicting branch FrogPilot-Development if it exists
run: | run: |
git branch -r | grep "origin/FrogPilot-Development" && git push origin --delete FrogPilot-Development || echo "No conflict with FrogPilot-Development" git branch -r | grep "origin/FrogPilot-Development" && git push origin --delete FrogPilot-Development || echo "No conflict with FrogPilot-Development"
- name: Create and push FrogPilot-Development branch - name: Force fetch and reset FrogPilot-Development branch from remote
run: | run: |
git checkout -b FrogPilot-Development frogai/FrogPilot-Development git fetch --all
git pull --rebase origin FrogPilot-Development || echo "No changes to pull" git checkout --orphan FrogPilot-Development
git push origin FrogPilot-Development git reset --hard frogai/FrogPilot-Development
git push origin FrogPilot-Development --force