From f6d9fa0dc2bad19c62adcbcea43d35687a71afc0 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, 4 Feb 2025 09:57:31 +0800 Subject: [PATCH] Update sync-branches.yml xda --- .github/workflows/sync-branches.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 6c644d9..ea83341 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -26,16 +26,33 @@ jobs: git remote add carrotpilot https://github.com/yysnet/carrotpilot.git git fetch carrotpilot +refs/heads/v7-wip10:refs/remotes/carrotpilot/v7-wip10 - - name: Ensure local branch matches remote + - name: Ensure local branch matches remote (carrotpilot) run: | # 检查本地是否已有 v7-wip10 分支,如果有则删除 if git show-ref --verify --quiet refs/heads/v7-wip10; then git branch -D v7-wip10 fi - # 创建本地 v7-wip10 分支并跟踪远程分支 git checkout -B v7-wip10 carrotpilot/v7-wip10 - - name: Push to origin repository + - name: Push to origin repository (carrotpilot) run: | git push origin v7-wip10 --force + + - name: Add remote for ajouatom/openpilot + run: | + git remote add openpilot https://github.com/ajouatom/openpilot.git + git fetch openpilot +refs/heads/v7-wip10-x-da:refs/remotes/openpilot/v7-wip10-x-da + + - name: Ensure local branch matches remote (openpilot) + run: | + # 检查本地是否已有 v7-wip10-x-da 分支,如果有则删除 + if git show-ref --verify --quiet refs/heads/v7-wip10-x-da; then + git branch -D v7-wip10-x-da + fi + # 创建本地 v7-wip10-x-da 分支并跟踪远程分支 + git checkout -B v7-wip10-x-da openpilot/v7-wip10-x-da + + - name: Push to origin repository (openpilot) + run: | + git push origin v7-wip10-x-da --force