-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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: Preventing merging without running atlantis apply on Gitlab #4651
Conversation
I have fixed the tests per #4653 refreshed the pr and rerun |
@shurkus please rebase your PR to the latest main branch. (I actually cannot refresh your branch due to permission denied issue) For future pull requests, please allow maintainers to edit your PR to simplify the merge process. |
@chenrui333 rebased also allow edit |
Thanks @shurkus! |
I wanted to highlight this feels like a breaking change in the way atlantis works with Gitlab Merge Requests, not a fix. This should be behind a feature flag, documented and fully tested (not just a "it works on my machine"). Especially as it's a weird workaround (the apply steps will always look like it's "running") with Gitlab lacking a way to enforce passing a certain CI job to merge an MR. The other difference is that on Github I can control which repositories require this enforcement, while this change will make all MRs on Gitlab requiring an apply before becoming mergeable. Can we consider to revert the changes until this is better implemented? |
I agree that this should be reverted as we come up with a more holistic solution here, for a few reasons:
I think one issue is the semantics of "pending" are different in gitlab and github, and I think we should either commit to unifying the two notions, or acknowledging they are different and document them differently. I definitely want to address these issues, and maybe pre-emptively making "apply" be running is part of that solution, but I think it requires more discussion |
what
Preventing merging without running atlantis apply on Gitlab
why
Preventing merging without running atlantis apply on Gitlab
tests
references
#4372