From b9ad7f820a9b28593223e62a038401e15e95379d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 03:08:04 +0000 Subject: [PATCH] [Dependencies]: Bump alexwilson/enable-github-automerge-action Bumps [alexwilson/enable-github-automerge-action](https://github.com/alexwilson/enable-github-automerge-action) from 1.0.0 to 2.0.0. - [Release notes](https://github.com/alexwilson/enable-github-automerge-action/releases) - [Commits](https://github.com/alexwilson/enable-github-automerge-action/compare/1.0.0...2.0.0) --- updated-dependencies: - dependency-name: alexwilson/enable-github-automerge-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/approve-dependabot.yml | 4 ++-- .github/workflows/on_new_pr.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/approve-dependabot.yml b/.github/workflows/approve-dependabot.yml index 57a20c4e..ccd22169 100644 --- a/.github/workflows/approve-dependabot.yml +++ b/.github/workflows/approve-dependabot.yml @@ -37,7 +37,7 @@ jobs: script: | core.info('Owner: ${{github.repository_owner}}'); - name: "Auto Merge" - uses: alexwilson/enable-github-automerge-action@1.0.0 + uses: alexwilson/enable-github-automerge-action@2.0.0 with: github-token: ${{secrets.SOURCE_PUSH_TOKEN}} merge-method: "MERGE" @@ -64,7 +64,7 @@ jobs: script: | core.info('Owner: ${{github.repository_owner}}'); - name: "Auto Merge" - uses: alexwilson/enable-github-automerge-action@1.0.0 + uses: alexwilson/enable-github-automerge-action@2.0.0 with: github-token: ${{secrets.SOURCE_PUSH_TOKEN}} merge-method: "MERGE" diff --git a/.github/workflows/on_new_pr.yml b/.github/workflows/on_new_pr.yml index aaa02404..ce5c2912 100644 --- a/.github/workflows/on_new_pr.yml +++ b/.github/workflows/on_new_pr.yml @@ -23,7 +23,7 @@ jobs: # Specifically check that dependabot (or another trusted party) created this pull-request, and that it has been labelled correctly. if: contains(github.event.pull_request.labels.*.name, 'dependencies') steps: - - uses: alexwilson/enable-github-automerge-action@1.0.0 + - uses: alexwilson/enable-github-automerge-action@2.0.0 with: github-token: ${{secrets.SOURCE_PUSH_TOKEN}} merge-method: "MERGE"