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

Merge main branch squashed 2025-03-22

Browse Source
This commit is contained in:
Gitea Actions 2025-03-22 09:51:52 +00:00 committed by Julian Mutter
parent 045e353094
commit 2be2381cc0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,13 +30,14 @@ jobs:
git log --oneline -5 git log --oneline -5
echo "----------" echo "----------"
git log --oneline -5 origin/main git log --oneline -5 origin/main
echo .
if [ $commits_ahead -ne 0 ] if [ $commits_ahead -ne 0 ]
then then
git rebase -X theirs origin/main git fetch origin
git merge -X theirs --squash origin/main
git commit -m "Merge main branch squashed $(date -I)"
else else
echo "Rebase not necessary" echo "Merge not necessary"
fi fi
- name: Set up Nix - name: Set up Nix
@ -53,4 +54,4 @@ jobs:
git diff --cached --quiet && echo "No changes to commit." && exit 0 git diff --cached --quiet && echo "No changes to commit." && exit 0
git commit -m "Update flake.lock $(date -I)" git commit -m "Update flake.lock $(date -I)"
git push --force-with-lease origin flake-updates git push origin flake-updates