Skip to content

release-3.21: disable renovate automerge #2610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2025
Merged

release-3.21: disable renovate automerge #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,27 @@
"dockerfile",
"rpm-lockfile",
],
"packageRules": [{
"matchPackageNames": ["/.*/"],
"groupName": "All updates",
"automerge": true,
// A known issue is that some non-Konflux CI jobs in currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
// Therefore, we use PR merge type and have automation approve PRs.
"automergeType": "pr",
"automergeStrategy": "squash",
// Tell Renovate that it can automerge branches at any time of the day.
"automergeSchedule": [
"at any time"
],
}],
"labels": ["auto-approve", "build-builder-image","rebuild-test-container"],
"packageRules": [
{
"matchPackageNames": [
"*",
],
"groupName": "All updates",
"automerge": true,
// A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
// Therefore, we use PR merge type and have automation approve PRs.
"automergeType": "pr",
"automergeStrategy": "squash",
// Tell Renovate that it can automerge branches at any time of the day.
"automergeSchedule": [
"at any time",
],
}
],
"labels": [
// Add auto-approve label which triggers the corresponding workflow.
"auto-approve",
"build-builder-image",
"rebuild-test-container",
],
}
4 changes: 2 additions & 2 deletions .github/workflows/auto-approve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:

jobs:
auto-approve:
name: Auto-approve Konflux updates
name: Auto-approve Konflux updates for default branch
runs-on: ubuntu-latest
if: github.actor == 'red-hat-konflux[bot]' && github.event.label.name == 'auto-approve'
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
steps:
- env:
GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }}
Expand Down
Loading