Skip to content

Commit

Permalink
Do not depend renovate official automerge
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed Oct 30, 2022
1 parent 01fd856 commit 1ffb7b0
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 33 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/auto-merge-dependabot-prs.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/workflows/merge-bot-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Merge bot PR after CI
on: pull_request

permissions:
contents: write
pull-requests: write
# checks: read # For private repositories
# actions: read # For private repositories

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.3.4
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- uses: actions/checkout@v3
- name: Wait other jobs
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
uses: kachick/wait-other-jobs@v1
timeout-minutes: 10
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Approve and merge
if: ${{steps.metadata.outputs.update-type != 'version-update:semver-major'}}
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

# Avoid `automerge` renovate official feature.
# It wait longtime to be merged.
# Avoid `platformAutomerge` renovate official feature.
# It requires many changes in GitHub settings.
# - `Allow auto-merge`
# - `Require status checks to pass before merging` and specify the status names
# Changing in all personal repository is annoy task for me. Even if using terrafform, getting mandatory CI names in each repo is too annoy!
renovate:
runs-on: ubuntu-latest
if: ${{ github.actor == 'renovate[bot]' }}
steps:
- uses: actions/checkout@v3
- name: Wait other jobs
uses: kachick/wait-other-jobs@v1
timeout-minutes: 10
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Approve and merge
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
1 change: 0 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"github>kachick/renovate-config-dprint:plugins"
],
"labels": ["dependencies", "renovate"],
"automerge": true,
"enabledManagers": ["regex"],
"packageRules": [
{
Expand Down

0 comments on commit 1ffb7b0

Please sign in to comment.