Skip to content
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.

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

Update preset to automerge lockFileMaintenance #16

Closed
wants to merge 1 commit into from

Conversation

trmartin4
Copy link
Member

🎟️ Tracking

PM-14677 Change lockfile PRs to automerge

📔 Objective

Modify default behavior for lockfile maintenance to automerge.

⏰ 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

@trmartin4 trmartin4 marked this pull request as ready for review November 12, 2024 15:51
@trmartin4
Copy link
Member Author

Should we consider condensing the schedule to once a week?

Copy link
Member

@Hinton Hinton left a comment

Choose a reason for hiding this comment

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

Have we identified how we would get renovate to bypass review requirements? At the same time it would be nice to have this be opt-in to ensure the appropriate jobs as set as blocking merge.

@trmartin4
Copy link
Member Author

Have we identified how we would get renovate to bypass review requirements?

Right, thank you for the reminder. I think the only one we have to deal with is the native-messaging-test-runner https://github.com/bitwarden/clients/blob/e91741b1466428303d5cd3429525c83b39ed5841/.github/CODEOWNERS#L95-L96, right? Can we add an exclusion like this? bitwarden/clients#11970

At the same time it would be nice to have this be opt-in to ensure the appropriate jobs as set as blocking merge.

Do you mean opt-in at the repo level?

@withinfocus
Copy link
Contributor

Oscar is speaking about the PR requirements pretty sure. In almost all repos we have the check run for security scans that creates a failure until someone approves its run, although it's not a required workflow so I am pretty sure Renovate could merge even with its failure. That said, some repos like clients also use the check run for build steps, therefore subsequent ones are skipped until it's approved; however, the test step does not use the check run and builds and tests right off the PR (secrets aren't available, so some steps are simply bypassed) so ... we're back to being in an a mergeable state I think. I looked into all this more and https://docs.renovatebot.com/configuration-options/#platformautomerge stuck tells me that with our PR requirement that tests pass (this is on now for our branch protection, not sure why it wasn't before) Renovate will wait until that's done and then merge.

@withinfocus
Copy link
Contributor

With respect to opting in, you could make a copy of default.json and offer it alongside, so some repos could request lockfile automerge.

@Hinton
Copy link
Member

Hinton commented Nov 14, 2024

All our repositories are configured to require a reviewer before it can be merged. Can we tell github to bypass this for renovate?

Yes opt-in on repository level, since you want to prevent failing builds and tests from being automatically merged.

@withinfocus
Copy link
Contributor

We could, but ... I don't want that open-ended for it as a bot and we can't configure the override for just certain types of PRs (that I know of).

@trmartin4
Copy link
Member Author

How is this different than what we're already doing, for example, for the version bump: bitwarden/clients#11850? We appear to be satisfying that requirement with a review from github-actions[bot]. Is this not a pattern we want to use elsewhere?

@withinfocus
Copy link
Contributor

bw-ghapp is our own bot we maintain for explicit operations.

@trmartin4
Copy link
Member Author

Abandoning this PR as we do not want to grant the Renovate user the permissions required to auto-merge.

@trmartin4 trmartin4 closed this Jan 5, 2025
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.

3 participants