Skip to content

Commit 8e72d3c

Browse files
committed
Use automerge without PR to reduce noise
1 parent 0b6fd5e commit 8e72d3c

File tree

4 files changed

+13
-23
lines changed

4 files changed

+13
-23
lines changed

.github/renovate.json5

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
],
1616
"platform": "github",
1717
"platformAutomerge": true,
18+
"automergeType": "branch",
1819
"rebaseWhen": "conflicted",
1920
"onboarding": false,
2021
"dependencyDashboardTitle": "Renovate Dashboard 🤖",

.github/workflows/main.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
name: CI
22

33
on:
4+
# Validate on push for Renovate auto merge without PR
45
push:
56
branches:
67
- 'master'
8+
- 'renovate/**'
79
pull_request:
810

911
jobs:

.github/workflows/renovate-approve.yml

-18
This file was deleted.

.github/workflows/renovate.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Renovate
22

33
on:
4+
# For manual dispatch
45
workflow_dispatch:
56
inputs:
67
dryRun:
@@ -11,16 +12,18 @@ on:
1112
description: Log-Level
1213
default: debug
1314
required: false
15+
# For auto-merge - should exclude non-renovate branch dispatches in job definitions below
16+
workflow_run:
17+
workflows:
18+
- CI
19+
types:
20+
- completed
1421
schedule:
1522
# 5 a.m. in JST(+9)
1623
- cron: "0 20 * * *"
24+
# For auto-merge and rebasing
1725
push:
1826
branches: ["master"]
19-
paths:
20-
- .github/renovate-bot.json5
21-
- .github/renovate.json5
22-
- .github/renovate/**.json5
23-
- .github/workflows/renovate.yml
2427

2528
env:
2629
LOG_LEVEL: debug
@@ -31,6 +34,8 @@ jobs:
3134
renovate:
3235
name: Renovate
3336
runs-on: ubuntu-latest
37+
# Exclude dispatch from non-renovate checks
38+
if: ${{ !(github.event_name == 'workflow_run' && !startsWith(github.event.workflow_run.head_branch, 'renovate/')) }}
3439
steps:
3540
- name: Generate a token
3641
id: generate-token

0 commit comments

Comments
 (0)