From 942f2ed1aa62d6cbd87bd0051da23166d979f0f0 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 1 Sep 2025 14:34:50 +0100 Subject: [PATCH 1/3] chore(dep): remove check for now --- .../automerge-dependabot-prs-into-collected-branch.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml index 74c4e86..5ceface 100644 --- a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml +++ b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml @@ -41,7 +41,10 @@ jobs: # if dependabot and checks ran # if: (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success') # qqqq put back in later if: (github.actor == 'dependabot[bot]' || github.event_name == 'workflow_dispatch')&& (github.event_name != 'check_suite' || github.event.check_suite.conclusion == 'success') - if: github.event.check_suite.conclusion == 'success' && github.actor == 'dependabot[bot]' && github.event.check_suite.pull_requests[0].base.ref == 'Automatic_version_update_dependabot' + + + # qqqq add in after testing && github.actor == 'dependabot[bot]' + if: github.event.check_suite.conclusion == 'success' && github.event.check_suite.pull_requests[0].base.ref == 'Automatic_version_update_dependabot' steps: - name: Checkout the repository uses: actions/checkout@v3 @@ -57,9 +60,9 @@ jobs: run: | pr_title="${{ github.event.pull_request.title }}" if [[ $pr_title == *"(major)"* ]]; then - echo "update_type=major" >> $github_output + echo "update_type=major" >> $GITHUB_OUTPUT else - echo "update_type=minor_or_patch" >> $github_output + echo "update_type=minor_or_patch" >> $GITHUB_OUTPUT fi - name: auto-merge minor and patch updates From 15aa4b365a725e756aaabf830b6801dd95ca6ca0 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 1 Sep 2025 14:46:21 +0100 Subject: [PATCH 2/3] 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 From acb65e516611ef35bbd8c05fbd8a1d7f57c10a9a Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 1 Sep 2025 14:55:11 +0100 Subject: [PATCH 3/3] chore(dep): merge check --- .../automerge-dependabot-prs-into-collected-branch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml index b6f25f3..782fd1c 100644 --- a/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml +++ b/.github/workflows/automerge-dependabot-prs-into-collected-branch.yml @@ -70,7 +70,7 @@ jobs: # 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 ${{ github.event.check_suite.pull_requests[0].number }} + run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -79,6 +79,6 @@ jobs: # 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 ${{ github.event.check_suite.pull_requests[0].number }} + run: gh pr merge --auto --merge ${{ github.event.check_suite.pull_requests[0].number }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file