ci: rebase rust-overlay onto main

igordejanovic · Jun 17, 2024 · ca3dab6 · ca3dab6
1 parent f0be30d
commit ca3dab6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/update-rust-overlay.yml b/.github/workflows/update-rust-overlay.yml
@@ -23,9 +23,11 @@ jobs:
           git config user.email "[email protected]"
           git add flake.lock
           git commit -m "build: update rust-overlay"
+          git rebase main
       - name: Push changes
         if: steps.commit.outcome == 'success'
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: rust-overlay
+          force_with_lease: true