From 8348d89f30598a73fee7efb4b5d34c3de201e71b Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 10 Feb 2025 15:06:51 -0800 Subject: [PATCH] more 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 68d7f4dca..6dd09ab66 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -35,7 +35,7 @@ jobs: API_TOKEN_GITHUB: '${{ steps.get_workflow_token.outputs.token }}' - name: rebase # TODO: fix upstream push-protected to retry when push fails run: | - ./ci/lib/setup-git.sh + source ./ci/lib/setup-git.sh git -C $GITHUB_WORKSPACE/nur fetch origin master git -C $GITHUB_WORKSPACE/nur pull --rebase origin master env: @@ -75,7 +75,7 @@ jobs: API_TOKEN_GITHUB: '${{ steps.get_workflow_token.outputs.token }}' - name: rebase and push run: | - ./nur/ci/lib/setup-git.sh + source ./nur/ci/lib/setup-git.sh git -C $GITHUB_WORKSPACE/nur-combined pull --rebase origin master git -C $GITHUB_WORKSPACE/nur-combined push origin HEAD:master env: