这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@vgrassia
Copy link
Member

📔 Objective

This PR enables rebasing of Renovate PRs only on conflicts and adds the dockerfile and docker-compose managers to need approval for patch PRs.

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Protected functional changes with optionality (feature flags)
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

…e' and 'docker-compose' managers to the patch approval rule.
@vgrassia vgrassia self-assigned this Oct 15, 2025
@vgrassia vgrassia requested a review from a team as a code owner October 15, 2025 16:58
non-pinned.json Outdated
"prConcurrentLimit": 0,
"prHourlyLimit": 0,
"branchConcurrentLimit": 0,
"rebaseWhen": "conflicted",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's wrong with the default auto?

auto: Renovate will autodetect the best setting. It will use behind-base-branch if configured to automerge or repository has been set to require PRs to be up to date. Otherwise, conflicted will be used instead

https://docs.renovatebot.com/configuration-options/

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't realize that the devops repository had the setting to require the branch to be up-to-date before merging. The default value of auto should work.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to be working as expected here and after the above was removed from devops Renovate started updating after every commit. Do we see a negative with being explicit here? I'd like to ensure less updates to all these.

Copy link
Member

@Hinton Hinton Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The negative is that you expect a different behaviour when those settings are enabled in the repository. I'd probably prefer we set this in specific repos explicitly for when auto doesn't work.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The more important question to me is "why rebase when not conflicted?". Independent of this not working as documented, why do we want to rebase outside of conflicts? It just seems unnecessary, and I don't want to be held to whatever Renovate does when we don't want it. This change can come back, here and org-wide.

@vgrassia vgrassia requested a review from Hinton October 15, 2025 19:31
@withinfocus withinfocus changed the title Enable rebasing on conflicts and add patch approvals for Docker Add patch approvals for Docker Oct 15, 2025
@vgrassia vgrassia merged commit 24ff297 into main Oct 15, 2025
2 checks passed
@vgrassia vgrassia deleted the vgrassia/update-base-config branch October 15, 2025 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants