nix/6.NUR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

more fixes

Browse source
This commit is contained in:
Gavin John 2025-02-10 15:06:51 -08:00
parent c0ef23ea93
commit 8348d89f30
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/update.yml vendored
View file

@ -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: