yet more CI fixes
This commit is contained in:
parent
8348d89f30
commit
b73f89bf9c
1 changed files with 2 additions and 2 deletions
4
.github/workflows/update.yml
vendored
4
.github/workflows/update.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue