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

Update sync-branches.yml

Browse Source 
v6
This commit is contained in:
机械小鸽 2025-01-05 12:51:20 +08:00 committed by GitHub
parent edeed252be
commit 557919ee63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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