From acba9eeb938be3ea9186d4317e5576363132b2db Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Wed, 24 Jan 2024 11:10:10 -0300 Subject: [PATCH] Update auto merge forward --- .github/workflows/auto-merge-forward.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge-forward.yml b/.github/workflows/auto-merge-forward.yml index 1e9343b..37435c7 100644 --- a/.github/workflows/auto-merge-forward.yml +++ b/.github/workflows/auto-merge-forward.yml @@ -25,8 +25,8 @@ jobs: GH_TOKEN: ${{ github.token }} run: echo "prs_count=$(gh pr list --app dependabot --state open --json number --jq length)" >> $GITHUB_OUTPUT - test-action: - name: GitHub Actions Test + merge-forward: + name: Merge Forward runs-on: ubuntu-latest needs: [count-open-dependabot-prs] if: needs.count-open-dependabot-prs.outputs.prs_count == 0 @@ -41,9 +41,9 @@ jobs: run: | git config user.name 'github-actions[bot]' git config user.email 'github-actions[bot]@users.noreply.github.com' - - name: Run Auto Merge Forward + - name: Run Merge Forward id: run-auto-merge-forward - uses: marcusdacoregio/auto-merge-forward@ad89c068e52e87d56654341691867889ed729e3e + uses: marcusdacoregio/auto-merge-forward@9eac812bc73673e1a358766ac2ce319bd31ce0f8 with: branches: '6.1.x, 6.2.x, main' dry-run: true