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

feat(platform/gitlab): handle detailed_merge_status to proceed with automerge #26438

Merged

Conversation

javaxiss
Copy link
Contributor

@javaxiss javaxiss commented Dec 27, 2023

Changes

The behavior changed by this PR concerns only the GitLab platform. Before proceeding with automerge, a check is done on GitLab platform version and Renovate will rely on detailed_merge_status instead of merge_status attribute only if GitLab platform version is ^15.6.0.

RENOVATE_X_GITLAB_MERGE_REQUEST_DELAY environment variable is introduced to allow users define their own delay value, it is initialized to 250 by default.

Context

This PR is a follow-up to the discussion #25433. It is a version feature gate on Gitlab platform (^15.6.0) : To proceed with automerge Renovate will check detailed_merge_status instead of merge_status, which is deprecated in Gitlab 15.6

Prior to Gitlab 15.6, Renovate continues to rely on merge_status attribute.

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

@CLAassistant
Copy link

CLAassistant commented Dec 27, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

needs new tests for coverage

@viceice
Copy link
Member

viceice commented Dec 27, 2023

you need to fix git author and committee and then force push. otherwise we can't merge this

@javaxiss javaxiss force-pushed the feat/gitlab-detailed-merge-status branch 4 times, most recently from 293fb27 to b08c570 Compare December 27, 2023 21:44
@javaxiss
Copy link
Contributor Author

you need to fix git author and committee and then force push. otherwise we can't merge this

done, I have taken onboard your suggestions and remarks, as well ☺️

Copy link
Member

@viceice viceice left a comment

Choose a reason for hiding this comment

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

it seems you've still a wrong git author or committee, otherwise LGTM

@javaxiss javaxiss force-pushed the feat/gitlab-detailed-merge-status branch from 78827ec to fbda0ed Compare December 29, 2023 15:36
@javaxiss
Copy link
Contributor Author

it seems you've still a wrong git author or committee, otherwise LGTM

Sorry I committed with an account not recognized in my Github profile. It seems good now, "All committers have signed the CLA." ;-)

@rarkins rarkins enabled auto-merge January 3, 2024 10:04
@rarkins rarkins added this pull request to the merge queue Jan 5, 2024
Merged via the queue into renovatebot:main with commit 31dc0fd Jan 5, 2024
34 checks passed
@renovate-release
Copy link
Collaborator

🎉 This PR is included in version 37.125.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 22, 2024
zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 24, 2024
zT-1337 pushed a commit to scm-manager/renovate that referenced this pull request Jan 24, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 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.

5 participants