From 15aa4b365a725e756aaabf830b6801dd95ca6ca0 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 1 Sep 2025 14:46:21 +0100 Subject: [PATCH] chore(deps): token definition --- .../automerge-dependabot-prs-into-collected-branch.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml index 5ceface..b6f25f3 100644 --- a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml +++ b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml @@ -69,14 +69,16 @@ jobs: if: steps.extract.outputs.update_type == 'minor_or_patch' # auto should set the the request to merge once checks complete # qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}" - run: gh pr merge --auto 1 + # run: gh pr merge --auto 1 + run: gh pr merge --auto ${{ github.event.check_suite.pull_requests[0].number }} env: - github_token: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: auto-merge major updates if: steps.extract.outputs.update_type == 'major' # auto should set the the request to merge once checks complete # qqqq could squash for cleaner? --squash "${{ github.event.pull_request.html_url }}" - run: gh pr merge --auto 1 + # run: gh pr merge --auto 1 + run: gh pr merge --auto ${{ github.event.check_suite.pull_requests[0].number }} env: - github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file