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

Update sync-branches.yml

Browse Source 
v7-wip10-x-da
This commit is contained in:
机械小鸽 2025-02-02 11:20:36 +08:00 committed by GitHub
parent 7d86a32209
commit 5dd224a846
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,22 +62,13 @@ jobs:
git checkout --orphan FrogPilot-Development git checkout --orphan FrogPilot-Development
git reset --hard frogai/FrogPilot-Development git reset --hard frogai/FrogPilot-Development
git push origin FrogPilot-Development --force git push origin FrogPilot-Development --force
# New remotes and branches
- name: Add remote for opgm/openpilot
run: |
git remote add opgm https://github.com/opgm/openpilot.git
git fetch opgm staging
- name: Sync staging branch from opgm/openpilot
run: |
git branch -r | grep "origin/staging" && git push origin --delete staging || echo "No conflict with staging"
git checkout -b staging opgm/staging
git push origin staging
- 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-wip8 git fetch ajouatom v7-wip10-x-da
- name: Sync v7-wip6 carrot2-v7 branch from ajouatom/openpilot - name: Sync v7-wip10-x-da ajouatom/openpilot
run: | run: |
git branch -r | grep "origin/v7-wip8" && git push origin --delete v7-wip8 || echo "No conflict with v7-wip5-ndv2 carrot2-v6" git branch -r | grep "origin/v7-wip10-x-da" && git push origin --delete v7-wip10-x-da || echo "No conflict withv7-wip10-x-da "
git checkout -b v7-wip8 ajouatom/v7-wip8 git checkout -b v7-wip10-x-da ajouatom/v7-wip10-x-da
git push origin v7-wip8 git push origin v7-wip10-x-da