disable automerge and align renovate config with telco5g-konflux repos#1469
Conversation
- Remove autoApprove, automerge and platformAutomerge settings - Replace approved/lgtm labels with allow-automatic-merge - Use matchPackageNames instead of matchFileNames for git-submodules - Add allow-automatic-merge label to tekton section - Add mintmaker-presets:refresh-rpm-lockfiles preset Co-authored-by: Cursor <cursoragent@cursor.com>
WalkthroughThis PR updates ChangesRenovate Merge Strategy Configuration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
/hold |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (2)
renovate.json (2)
6-7: ⚡ Quick win
automergeStrategyandautomergeTypeare dead config without a correspondingautomerge: true.The PR removes
automerge/platformAutomergebut leaves these two top-level fields. Withoutautomerge: true(globally or per rule), Renovate ignoresautomergeStrategyandautomergeTypeentirely. They add noise and may confuse future editors into thinking automerge is still active.🧹 Proposed cleanup
- "automergeStrategy": "rebase", - "automergeType": "pr",🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@renovate.json` around lines 6 - 7, Remove the now-dead top-level Renovate config keys "automergeStrategy" and "automergeType" (they only take effect when "automerge": true is present); either delete these two fields from renovate.json to avoid confusion, or if you intended automerge behavior, add "automerge": true (globally or per-rule) instead—target the top-level keys "automergeStrategy" and "automergeType" when making the change.
6-7: ⚡ Quick winRemove orphaned
automergeStrategyandautomergeType— they have no effect withoutautomerge: true.This PR removes
automerge/platformAutomergein favour of label-based merging viaallow-automatic-merge. However,automergeStrategyandautomergeTypeat the top level are left behind. Without a correspondingautomerge: true(globally or per rule), Renovate ignores both fields entirely. Keeping them risks misleading future maintainers into thinking Renovate-native automerge is still active.🧹 Proposed cleanup
- "automergeStrategy": "rebase", - "automergeType": "pr",🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@renovate.json` around lines 6 - 7, Remove the orphaned Renovate config keys "automergeStrategy" and "automergeType" because they have no effect without "automerge: true"; locate those keys in renovate.json (the top-level config), delete both entries, and ensure we rely on the label-based merging workflow ("allow-automatic-merge"/platform label rules) instead of reintroducing "automerge" or "platformAutomerge".
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@renovate.json`:
- Around line 6-7: Remove the now-dead top-level Renovate config keys
"automergeStrategy" and "automergeType" (they only take effect when "automerge":
true is present); either delete these two fields from renovate.json to avoid
confusion, or if you intended automerge behavior, add "automerge": true
(globally or per-rule) instead—target the top-level keys "automergeStrategy" and
"automergeType" when making the change.
- Around line 6-7: Remove the orphaned Renovate config keys "automergeStrategy"
and "automergeType" because they have no effect without "automerge: true";
locate those keys in renovate.json (the top-level config), delete both entries,
and ensure we rely on the label-based merging workflow
("allow-automatic-merge"/platform label rules) instead of reintroducing
"automerge" or "platformAutomerge".
|
/lgtm |
|
@by2waysprojects: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: by2waysprojects, danmanor The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
3 participants
Summary by CodeRabbit