workflow: push right after rebasing
Some checks failed
Update Nix Flake / update-flake (push) Failing after 16s
Some checks failed
Update Nix Flake / update-flake (push) Failing after 16s
This commit is contained in:
@ -22,7 +22,7 @@ jobs:
|
||||
git config user.name "Gitea Actions"
|
||||
git config user.email "actions@gitea.local"
|
||||
|
||||
- name: Merge main branch
|
||||
- name: Rebase from main branch
|
||||
shell: bash
|
||||
run: |
|
||||
commits_ahead=$(git rev-list --count HEAD..origin/main)
|
||||
@ -35,6 +35,7 @@ jobs:
|
||||
if [ $commits_ahead -ne 0 ]
|
||||
then
|
||||
git rebase -X theirs origin/main
|
||||
git push --force-with-lease origin flake-updates
|
||||
else
|
||||
echo "Rebase not necessary"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user