Update sync-branches.yml

v7-wip5-ndv2
This commit is contained in:
机械小鸽 2025-01-03 16:47:47 +08:00 committed by GitHub
parent b6c0551c62
commit 3a3c9e7ee3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -75,12 +75,12 @@ 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 carrot2-v6 git fetch ajouatom v7-wip5-ndv2
- name: Sync carrot2-v6 branch from ajouatom/openpilot - name: Sync v7-wip5-ndv2 carrot2-v6 branch from ajouatom/openpilot
run: | run: |
git branch -r | grep "origin/carrot2-v6" && git push origin --delete carrot2-v6 || echo "No conflict with carrot2-v6" git branch -r | grep "origin/v7-wip5-ndv2" && git push origin --delete v7-wip5-ndv2 || echo "No conflict with v7-wip5-ndv2 carrot2-v6"
git checkout -b carrot2-v6 ajouatom/carrot2-v6 git checkout -b v7-wip5-ndv2 ajouatom/v7-wip5-ndv2
git push origin carrot2-v6 git push origin v7-wip5-ndv2
# Add remote for commaai/openpilot # Add remote for commaai/openpilot
- name: Add remote for commaai/openpilot - name: Add remote for commaai/openpilot
run: | run: |