From 4f2962a7e8abde85aa2aed9b3a63f34d4c64a387 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Wed, 21 Sep 2022 17:08:03 -0700 Subject: [PATCH] fix CI errors on main branch When CI runs on main branch, the workflow fails to create the "main" branch as it exists already. Fix: uses "-f" to force creating "main" branch. --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c0195a2..7bbadee 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -85,10 +85,10 @@ jobs: with: fetch-depth: 0 # The 'main' branch is needed for radicle-surf vcs::git::tests::test_submodule_failure, - # however actions/checkout uses the default branch 'master' at this moment. + # however actions/checkout uses the init.defaultBranch 'master' at this moment. # We will improve the test soon to remove this need. - # - run: git branch main - # - run: git branch -u origin/main main + - run: git branch -f main # -f in case of running against 'main' branch. + - run: git branch -u origin/main main - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -120,7 +120,7 @@ jobs: - uses: actions/checkout@master with: fetch-depth: 0 - - run: git branch main + - run: git branch -f main - run: git branch -u origin/main main - uses: actions-rs/toolchain@v1 with: