From b73f89bf9cba652a4403a6e37343a53e68d5d774 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 10 Feb 2025 15:32:02 -0800 Subject: [PATCH] yet more CI fixes --- .github/workflows/update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 6dd09ab66..38c4067a6 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -36,8 +36,8 @@ jobs: - name: rebase # TODO: fix upstream push-protected to retry when push fails run: | source ./ci/lib/setup-git.sh - git -C $GITHUB_WORKSPACE/nur fetch origin master - git -C $GITHUB_WORKSPACE/nur pull --rebase origin master + git fetch origin master + git pull --rebase origin master env: GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }} - uses: CasperWA/push-protected@v2