Skip to content

Commit 4ccb17f

Browse files
release-2.38: disable renovate automerge (#2344)
Co-authored-by: Misha Sugakov <[email protected]>
1 parent 204bc60 commit 4ccb17f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
}
8989
],
9090
"labels": [
91+
// Add auto-approve label which triggers the corresponding workflow.
9192
"auto-approve",
9293
],
9394
}

.github/workflows/auto-approve.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77

88
jobs:
99
auto-approve:
10-
name: Auto-approve Konflux updates
10+
name: Auto-approve Konflux updates for default branch
1111
runs-on: ubuntu-latest
12-
if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve'
12+
if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve' && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch
1313
steps:
1414
- env:
1515
GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)