From 8f8f7f52272ff77de108b3b07e40b6b80dfb30c4 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Fri, 13 Oct 2023 10:56:25 -0400 Subject: [PATCH 1/2] ci(dependabot): Attempt to use automerge with default GH token. --- .github/workflows/dependabot.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 77e770925..75176a3a1 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -12,10 +12,9 @@ jobs: pull-requests: write if: github.actor == 'dependabot[bot]' steps: - - uses: actions/checkout@v2 - name: Auto-approve PR uses: hmarr/auto-approve-action@v3 - name: Enable auto-merge - run: gh pr merge --merge --auto ${{ github.event.pull_request.number }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: alexwilson/enable-github-automerge-action@main + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file From 5a58b4baf7e6b999bc647c95ece981da78423e33 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Fri, 13 Oct 2023 10:57:16 -0400 Subject: [PATCH 2/2] ci(dependabot): Update workflow comment [skip ci] --- .github/workflows/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 75176a3a1..3337f3acb 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -6,6 +6,7 @@ jobs: auto-approve-and-automerge: # sources: # https://github.com/hmarr/auto-approve-action + # https://github.com/marketplace/actions/enable-github-automerge # https://github.com/marketplace/actions/enable-pull-request-automerge#dependabot-example runs-on: ubuntu-latest permissions: