From 60aaa6dee2a474247b77dd1a75db57c9415c97c8 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov <zimniy@cyberbrain.pw> Date: Thu, 20 Feb 2025 15:37:45 +0400 Subject: [PATCH] ci: move optional step down Signed-off-by: Dmitriy Safronov <zimniy@cyberbrain.pw> --- .github/workflows/push-rebase.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-rebase.yaml b/.github/workflows/push-rebase.yaml index 9533922..48a50ba 100644 --- a/.github/workflows/push-rebase.yaml +++ b/.github/workflows/push-rebase.yaml @@ -11,6 +11,10 @@ jobs: name: Push [rebase] runs-on: ubuntu-latest steps: + - name: "Rebase all Dependabot's pull requests on every push to the main branch" + uses: bbeesley/gha-auto-dependabot-rebase@v1.5.92 + env: + GITHUB_TOKEN: ${{ secrets.PAT }} - name: "Rebase all users' pull requests on release push to the main branch" uses: peter-evans/rebase@v3.1.0 with: @@ -20,7 +24,3 @@ jobs: no-rebase dependencies if: "${{ startsWith(github.event.head_commit.message, 'docs: update changelog for ') }}" - - name: "Rebase all Dependabot's pull requests on every push to the main branch" - uses: bbeesley/gha-auto-dependabot-rebase@v1.5.92 - env: - GITHUB_TOKEN: ${{ secrets.PAT }} -- GitLab