From eb5ae29d51aad3bbc18a87e53296d51a203fef13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:26:13 +0000 Subject: [PATCH 1/2] Bump pascalgn/automerge-action from 0.14.3 to 0.16.3 Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.14.3 to 0.16.3. - [Release notes](https://github.com/pascalgn/automerge-action/releases) - [Commits](https://github.com/pascalgn/automerge-action/compare/v0.14.3...v0.16.3) --- updated-dependencies: - dependency-name: pascalgn/automerge-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/auto-merge-github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-github-actions.yml b/.github/workflows/auto-merge-github-actions.yml index 94083a5..60394cd 100644 --- a/.github/workflows/auto-merge-github-actions.yml +++ b/.github/workflows/auto-merge-github-actions.yml @@ -18,6 +18,6 @@ jobs: with: github-token: ${{ secrets.GH_TOKEN }} - name: Merge pull request - uses: pascalgn/automerge-action@v0.14.3 + uses: pascalgn/automerge-action@v0.16.3 env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} From cf7e2a415cbcfbaa3caf9cc0731982f89811285e Mon Sep 17 00:00:00 2001 From: Maciej Michalski <5445923+spy86@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:58:06 +0200 Subject: [PATCH 2/2] Update auto-merge-github-actions.yml --- .github/workflows/auto-merge-github-actions.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge-github-actions.yml b/.github/workflows/auto-merge-github-actions.yml index 60394cd..20a151c 100644 --- a/.github/workflows/auto-merge-github-actions.yml +++ b/.github/workflows/auto-merge-github-actions.yml @@ -5,19 +5,20 @@ on: - opened - synchronize permissions: - contents: write + contents: write-all + pull-requests: write jobs: auto-merge: runs-on: ubuntu-latest if: github.event.pull_request.user.login == 'dependabot[bot]' && contains(github.event.pull_request.head.ref, 'dependabot/github_actions/') steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Auto approve uses: hmarr/auto-approve-action@v2.0.0 with: github-token: ${{ secrets.GH_TOKEN }} - name: Merge pull request - uses: pascalgn/automerge-action@v0.16.3 + uses: pascalgn/automerge-action@v0.14.3 env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}