From 1e63d0447d7ced6fdc1a7357be22175eb867c9d9 Mon Sep 17 00:00:00 2001 From: Tang Rufus Date: Tue, 3 Dec 2024 14:51:55 +0000 Subject: [PATCH 1/5] Dependabot auto-merge non-major PRs on current repo --- .github/workflows/dependabot-auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index bce673a..c4ec5e0 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -15,7 +15,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'typisttech/wordfence' + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'typisttech/wordfence-api' steps: - name: Dependabot metadata id: metadata @@ -23,7 +23,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs - if: steps.metadata.outputs.update-type == 'version-update:semver-minor' + if: steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 3e0b79f412db0b60ad3a00bbb1c3bf1bc208749b Mon Sep 17 00:00:00 2001 From: Tang Rufus Date: Tue, 3 Dec 2024 14:53:34 +0000 Subject: [PATCH 2/5] Update dependabot-auto-merge.yml --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index c4ec5e0..e9e4573 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -18,7 +18,7 @@ jobs: if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'typisttech/wordfence-api' steps: - name: Dependabot metadata - id: metadata + id: dependabot-metadata uses: dependabot/fetch-metadata@v2 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From 2c613abb1e6c4a9a6c105cbc162679cf83aaf923 Mon Sep 17 00:00:00 2001 From: Tang Rufus Date: Tue, 3 Dec 2024 14:54:59 +0000 Subject: [PATCH 3/5] Update dependabot-auto-merge.yml --- .github/workflows/dependabot-auto-merge.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index e9e4573..cb84bfb 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -20,10 +20,8 @@ jobs: - name: Dependabot metadata id: dependabot-metadata uses: dependabot/fetch-metadata@v2 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs - if: steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' + if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'rails') && steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}} run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 237e02103b7927fa2a75f846ba752f3a1c395bad Mon Sep 17 00:00:00 2001 From: Tang Rufus Date: Tue, 3 Dec 2024 14:57:41 +0000 Subject: [PATCH 4/5] Update dependabot-auto-merge.yml --- .github/workflows/dependabot-auto-merge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index cb84bfb..f556dd5 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -20,6 +20,8 @@ jobs: - name: Dependabot metadata id: dependabot-metadata uses: dependabot/fetch-metadata@v2 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'rails') && steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}} run: gh pr merge --auto --merge "$PR_URL" From 65120848194ecd8b8f15bb57e0793fed53247380 Mon Sep 17 00:00:00 2001 From: Tang Rufus Date: Tue, 3 Dec 2024 14:58:15 +0000 Subject: [PATCH 5/5] Update dependabot-auto-merge.yml --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index f556dd5..f10a3d1 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -23,7 +23,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs - if: ${{contains(steps.dependabot-metadata.outputs.dependency-names, 'rails') && steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'}} + if: steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major'}} run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}}