From 91ba0794f3c7211c3f09d975df77768242c24349 Mon Sep 17 00:00:00 2001 From: Al Cutter Date: Mon, 9 Oct 2023 16:43:15 +0100 Subject: [PATCH] Rebase automerges --- .github/workflows/dependabot_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot_pr.yml b/.github/workflows/dependabot_pr.yml index b33f582..288c392 100644 --- a/.github/workflows/dependabot_pr.yml +++ b/.github/workflows/dependabot_pr.yml @@ -31,7 +31,7 @@ jobs: files_ignore: '**/go.{sum,mod}' - name: Run step if any permitted file(s) change if: ${{ steps.changed-files.outputs.any_changed == 'false' && ( steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }} - run: gh pr review --approve "$PR_URL" && gh pr merge --auto --merge "$PR_URL" + run: gh pr review --approve "$PR_URL" && gh pr merge --auto --rebase "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}