Update sync-branches.yml

wip6
This commit is contained in:
机械小鸽 2025-01-05 12:31:49 +08:00 committed by GitHub
parent f291ef956f
commit edeed252be
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
run: |
git remote add ajouatom https://github.com/ajouatom/openpilot.git
git fetch ajouatom v7-wip5-ndv2
- name: Sync v7-wip5-ndv2 carrot2-v6 branch from ajouatom/openpilot
git fetch ajouatom v7-wip6-ndv2
- name: Sync v7-wip6-ndv2 carrot2-v6 branch from ajouatom/openpilot
run: |
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 v7-wip5-ndv2 ajouatom/v7-wip5-ndv2
git push origin v7-wip5-ndv2
git branch -r | grep "origin/v7-wip6-ndv2" && git push origin --delete v7-wip6-ndv2 || echo "No conflict with v7-wip5-ndv2 carrot2-v6"
git checkout -b v7-wip6-ndv2 ajouatom/v7-wip6-ndv2
git push origin v7-wip6-ndv2
# Add remote for commaai/openpilot
- name: Add remote for commaai/openpilot
run: |