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

fix(config): Remove usePlatformAutomerge restriction with gitLabIgnoreApprovals #29972

Merged
merged 4 commits into from
Jul 1, 2024

Conversation

aav7fl
Copy link
Contributor

@aav7fl aav7fl commented Jul 1, 2024

Changes

Remove usePlatformAutomerge restriction with gitLabIgnoreApprovals.

Context

Discussed in #29968.

I took a non-invasive approach minimize any impact elsewhere by users.

  • We use gitLabIgnoreApprovals to bypass approver restrictions on GitLab to auto-merge MRs that pass our pipeline.
  • We want to auto-merge our MRs and use automergeSchedule to enforce this during business hours.
  • We can't automergeSchedule if platformAutomerge=true, so we make platformAutomerge=false
  • Now we can't use gitLabIgnoreApprovals anymore since it's gated behind platformAutomerge=true

We remove this check since it doesn't look like it's necessary.

Original PR with this addition even includes a comment wondering if it can be used with normal auto-merge.

https://github.com/renovatebot/renovate/pull/10981/files#r679454321

Documentation (please check one with an [x])

  • I have updated the documentation, or
  • No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

  • Code inspection only, or
  • Newly added/modified unit tests, or
  • No unit tests but ran on a real repository, or
  • Both unit tests + ran on a real repository

Copy link
Collaborator

@rarkins rarkins left a comment

Choose a reason for hiding this comment

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

Needs test addition for new case

@aav7fl
Copy link
Contributor Author

aav7fl commented Jul 1, 2024

Needs test addition for new case

@rarkins Sorry about that. New test added.

@aav7fl aav7fl requested a review from rarkins July 1, 2024 19:03
@aav7fl aav7fl requested a review from viceice July 1, 2024 19:35
rarkins
rarkins previously approved these changes Jul 1, 2024
@aav7fl
Copy link
Contributor Author

aav7fl commented Jul 1, 2024

Had to push again to fix prettier. Hooks weren't working locally in my dev container.

@rarkins rarkins enabled auto-merge July 1, 2024 19:50
@rarkins rarkins added this pull request to the merge queue Jul 1, 2024
Merged via the queue into renovatebot:main with commit d0e0bbe Jul 1, 2024
38 checks passed
@renovate-release
Copy link
Collaborator

🎉 This issue has been resolved in version 37.421.7 🎉

The release is available on:

Your semantic-release bot 📦🚀

bryannaegele pushed a commit to bryannaegele/renovate that referenced this pull request Jul 8, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants