update: rebase before push
This commit is contained in:
parent
43182ef8b6
commit
776b69a12a
1 changed files with 7 additions and 0 deletions
7
.github/workflows/update.yml
vendored
7
.github/workflows/update.yml
vendored
|
|
@ -33,6 +33,13 @@ jobs:
|
|||
run: ./ci/update-nur.sh
|
||||
env:
|
||||
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
|
||||
git -C $GITHUB_WORKSPACE/nur fetch origin master
|
||||
git -C $GITHUB_WORKSPACE/nur pull --rebase origin master
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
|
||||
- uses: CasperWA/push-protected@v2
|
||||
with:
|
||||
token: ${{ steps.get_workflow_token.outputs.token }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue