julian/hydra-jobs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workflow: push right after rebasing
Some checks failed
Update Nix Flake / update-flake (push) Failing after 16s
Details

Browse Source
This commit is contained in:
Julian Mutter
2025-03-23 18:56:50 +01:00
parent fc412f2596
commit 3263a37074
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/update-flake.yaml
View File

@ -22,7 +22,7 @@ jobs:
git config user.name "Gitea Actions" git config user.name "Gitea Actions"
git config user.email "actions@gitea.local" git config user.email "actions@gitea.local"
- name: Merge main branch - name: Rebase from main branch
shell: bash shell: bash
run: | run: |
commits_ahead=$(git rev-list --count HEAD..origin/main) commits_ahead=$(git rev-list --count HEAD..origin/main)
@ -35,6 +35,7 @@ jobs:
if [ $commits_ahead -ne 0 ] if [ $commits_ahead -ne 0 ]
then then
git rebase -X theirs origin/main git rebase -X theirs origin/main
git push --force-with-lease origin flake-updates
else else
echo "Rebase not necessary" echo "Rebase not necessary"
fi fi