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.

Sign up for GitHub

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

Jump to bottom

fix: In Gitlab, if an Atlantis 'Apply' Pipeline Job fails, it cannot be Re-Applied on the Same Commit #4007

Merged
merged 8 commits into from
Dec 12, 2023
Merged

fix: In Gitlab, if an Atlantis 'Apply' Pipeline Job fails, it cannot be Re-Applied on the Same Commit #4007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f37a047
Fix GitLab CI Must Pass
X-Guardian Dec 2, 2023
c7ff9b0
Fix projectID
X-Guardian Dec 2, 2023
bbf1299
nolint:staticcheck
X-Guardian Dec 2, 2023
d102e47
nolint:gosec
X-Guardian Dec 2, 2023
9ebcb6d
Fix formatting
X-Guardian Dec 2, 2023
175dc1f
Merge branch 'main' into gitlab-ci-must-pass-fix
X-Guardian Dec 2, 2023
6cc6b59
Merge branch 'main' into gitlab-ci-must-pass-fix
jamengual Dec 7, 2023
5e52695
Merge branch 'main' into gitlab-ci-must-pass-fix
GenPage Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions server/events/vcs/gitlab_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,17 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest

allowSkippedPipeline := project.AllowMergeOnSkippedPipeline && isPipelineSkipped

ok, err := g.SupportsDetailedMergeStatus()
supportsDetailedMergeStatus, err := g.SupportsDetailedMergeStatus()
if err != nil {
return false, err
}

if ((ok && (mr.DetailedMergeStatus == "mergeable" || mr.DetailedMergeStatus == "ci_still_running")) ||
//nolint:staticcheck // SA1019 this check ensures compatibility with older gitlab versions
(!ok && mr.MergeStatus == "can_be_merged")) &&
if ((supportsDetailedMergeStatus &&
(mr.DetailedMergeStatus == "mergeable" ||
mr.DetailedMergeStatus == "ci_still_running" ||
mr.DetailedMergeStatus == "ci_must_pass")) ||
(!supportsDetailedMergeStatus &&
mr.MergeStatus == "can_be_merged")) && //nolint:staticcheck // Need to reference deprecated field for backwards compatibility
mr.ApprovalsBeforeMerge <= 0 &&
mr.BlockingDiscussionsResolved &&
!mr.WorkInProgress &&
Expand Down
Loading