From 98bcda9235fba4747918cf578ef01cfe3c705393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=B0=8F=E9=B8=BD?= <128568434+jixiexiaoge@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:55:01 +0800 Subject: [PATCH] Update sync-branches.yml wip7 --- .github/workflows/sync-branches.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index f30d78a..4cdbe2b 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -75,9 +75,9 @@ jobs: - name: Add remote for ajouatom/openpilot run: | git remote add ajouatom https://github.com/ajouatom/openpilot.git - git fetch ajouatom v7-wip6-casper_ev - - name: Sync v7-wip6 carrot2-v6 branch from ajouatom/openpilot + git fetch ajouatom v7-wip7 + - name: Sync v7-wip6 carrot2-v7 branch from ajouatom/openpilot 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 checkout -b v7-wip6-casper_ev ajouatom/v7-wip6-casper_ev - git push origin v7-wip6-casper_ev + 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-wip7 ajouatom/v7-wip7 + git push origin v7-wip7