workflow: push right after rebasing

.gitea/workflows/update-flake.yaml

@@ -2,7 +2,7 @@ name: Update Nix Flake
 
 on:
   schedule:
-    - cron: "30 0 * * *" # daily run
+    - cron: "45 0 * * *" # daily run
   workflow_dispatch: {}
 
 jobs:
@@ -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)
@@ -30,14 +30,14 @@ jobs:
             git log --oneline -5
             echo "----------"
             git log --oneline -5 origin/main
+            echo .
 
             if [ $commits_ahead -ne 0 ]
             then
-              git fetch origin
+              git rebase -X theirs origin/main
-              git merge -X theirs --squash origin/main
+              git push --force-with-lease origin flake-updates
-              git commit -m "Merge main branch squashed $(date -I)"
             else
-              echo "Merge not necessary"
+              echo "Rebase not necessary"
             fi
 
       - name: Set up Nix
@@ -50,9 +50,8 @@ jobs:
         shell: bash
         run: |
           git add flake.lock
-          if git diff --quiet; then
+          git status
-            echo "No changes to commit."
+          git diff --cached --quiet && echo "No changes to commit." && exit 0
-          else
+
           git commit -m "Update flake.lock $(date -I)"
-            git push origin flake-updates
+          git push --force-with-lease origin flake-updates
-          fi