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

Update sync-branches.yml

Browse Source 
wip7
This commit is contained in:
机械小鸽 2025-01-12 17:55:01 +08:00 committed by GitHub
parent 276807e80c
commit 98bcda9235
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,9 @@ jobs:
- name: Add remote for ajouatom/openpilot - name: Add remote for ajouatom/openpilot
run: | run: |
git remote add ajouatom https://github.com/ajouatom/openpilot.git git remote add ajouatom https://github.com/ajouatom/openpilot.git
git fetch ajouatom v7-wip6-casper_ev git fetch ajouatom v7-wip7
- name: Sync v7-wip6 carrot2-v6 branch from ajouatom/openpilot - name: Sync v7-wip6 carrot2-v7 branch from ajouatom/openpilot
run: | run: |
git branch -r | grep "origin/v7-wip6-casper_ev" && git push origin --delete v7-wip6-casper_ev || echo "No conflict with v7-wip5-ndv2 carrot2-v6" git branch -r | grep "origin/v7-wip7" && git push origin --delete v7-wip7 || echo "No conflict with v7-wip5-ndv2 carrot2-v6"
git checkout -b v7-wip6-casper_ev ajouatom/v7-wip6-casper_ev git checkout -b v7-wip7 ajouatom/v7-wip7
git push origin v7-wip6-casper_ev git push origin v7-wip7