From 06a508d1929c579d6e87463e36364207f24e8d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:59:46 +0000 Subject: [PATCH 1/2] Bump hmarr/auto-approve-action from 2.0.0 to 4.0.0 Bumps [hmarr/auto-approve-action](https://github.com/hmarr/auto-approve-action) from 2.0.0 to 4.0.0. - [Release notes](https://github.com/hmarr/auto-approve-action/releases) - [Commits](https://github.com/hmarr/auto-approve-action/compare/v2.0.0...v4.0.0) --- updated-dependencies: - dependency-name: hmarr/auto-approve-action dependency-type: direct:production update-type: version-update:semver-major ... 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 f7a05d0..83f98b6 100644 --- a/.github/workflows/auto-merge-github-actions.yml +++ b/.github/workflows/auto-merge-github-actions.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Auto approve - uses: hmarr/auto-approve-action@v2.0.0 + uses: hmarr/auto-approve-action@v4.0.0 with: github-token: ${{ secrets.GH_TOKEN }} - name: Merge pull request From 73981a73414d0e878ca7cf4a9b33929b130f82a1 Mon Sep 17 00:00:00 2001 From: Maciej Michalski <5445923+spy86@users.noreply.github.com> Date: Mon, 17 Jun 2024 22:07:53 +0200 Subject: [PATCH 2/2] Update auto-merge-github-actions.yml --- .github/workflows/auto-merge-github-actions.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge-github-actions.yml b/.github/workflows/auto-merge-github-actions.yml index 83f98b6..86262f3 100644 --- a/.github/workflows/auto-merge-github-actions.yml +++ b/.github/workflows/auto-merge-github-actions.yml @@ -14,10 +14,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Auto approve - uses: hmarr/auto-approve-action@v4.0.0 + uses: hmarr/auto-approve-action@v2.0.0 with: github-token: ${{ secrets.GH_TOKEN }} - name: Merge pull request - uses: pascalgn/automerge-action@v0.14.3 + uses: "pascalgn/automerge-action@v0.16.3" + permissions: + contents: write env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"