From ca3dab6e83e006389ee5a20e6532e34b7d0bb3c6 Mon Sep 17 00:00:00 2001 From: Igor Dejanovic Date: Mon, 17 Jun 2024 13:05:30 +0200 Subject: [PATCH] ci: rebase rust-overlay onto main --- .github/workflows/update-rust-overlay.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-rust-overlay.yml b/.github/workflows/update-rust-overlay.yml index 726e5f13..dcfc4f5c 100644 --- a/.github/workflows/update-rust-overlay.yml +++ b/.github/workflows/update-rust-overlay.yml @@ -23,9 +23,11 @@ jobs: git config user.email "action@github.com" 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