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 merge_commit_sha for GitLab #626

Merged

Conversation

mfocko
Copy link
Member

@mfocko mfocko commented Aug 5, 2021

Previous solution utilized only merge_commit, that is after merging MR.
Since v0.20.0 python-gitlab supports test merges as GitHub. Fixes
behaviour to be consistent with GitHub's.


Fix bug and unify behaviour in merge_commit_sha for GitLab MRs. Since python-gitlab v0.20.0, it is supported to create test merge. In case of merged pull requests on GitLab merge_commit_sha returns the SHA of merge commit, otherwise provides SHA of the test merge commit.

@softwarefactory-project-zuul
Copy link
Contributor

Build failed.

Previous solution utilized only merge_commit, that is after merging MR.
Since v0.20.0 python-gitlab supports test merges as GitHub. Fixes
behaviour to be consistent with GitHub's.

Signed-off-by: Matej Focko <[email protected]>
@mfocko mfocko force-pushed the fix-gitlab-merge-ref branch from 8a15981 to 789d320 Compare August 5, 2021 11:38
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.

@mfocko mfocko requested a review from lachmanfrantisek August 5, 2021 12:07
@mfocko mfocko added the mergeit When set, zuul wil gate and merge the PR. label Aug 5, 2021
@softwarefactory-project-zuul
Copy link
Contributor

Build succeeded (gate pipeline).

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 7305c19 into packit:main Aug 5, 2021
@mfocko mfocko deleted the fix-gitlab-merge-ref branch March 6, 2022 01:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mergeit When set, zuul wil gate and merge the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants