From b6c0551c6209fceded04c01691fb841034a38ffd 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: Tue, 31 Dec 2024 14:07:42 +0800 Subject: [PATCH] Update sync-branches.yml r3 --- .github/workflows/sync-branches.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 89d6d63..52f110e 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -85,14 +85,9 @@ jobs: - name: Add remote for commaai/openpilot run: | git remote add commaai https://github.com/commaai/openpilot.git - git fetch commaai master + git fetch commaai release3 - # Sync master branch from commaai/openpilot to opmaster - - name: Sync master branch to opmaster - run: | - git branch -r | grep "origin/opmaster" && git push origin --delete opmaster || echo "No conflict with opmaster" - git checkout -b opmaster commaai/master - git push origin opmaster + # Sync release3 branch from commaai/openpilot to release3 - name: Sync release3 branch run: |