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

fix: Preventing merging without running atlantis apply on Gitlab #4651

Merged
merged 6 commits into from
Jun 15, 2024
Merged

fix: Preventing merging without running atlantis apply on Gitlab #4651

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce1c3de
Preventing merging without running atlantis apply on Gitlab #4372
shurkus Jun 11, 2024
c988d6d
Merge branch 'runatlantis:main' into issues_4372
shurkus Jun 12, 2024
8799ba0
lint
shurkus Jun 12, 2024
5437103
Merge branch 'main' into issues_4372
shurkus Jun 12, 2024
57194ef
Merge branch 'runatlantis:main' into issues_4372
shurkus Jun 13, 2024
a27ef55
Merge branch 'main' into issues_4372
chenrui333 Jun 14, 2024
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
6 changes: 6 additions & 0 deletions server/events/plan_command_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ func (p *PlanCommandRunner) runAutoplan(ctx *command.Context) {
ctx.Log.Warn("unable to update plan commit status: %s", err)
}

if baseRepo.VCSHost.Type == models.Gitlab {
if err := p.commitStatusUpdater.UpdateCombinedCount(ctx.Log, ctx.Pull.BaseRepo, ctx.Pull, models.PendingCommitStatus, command.Apply, 0, len(projectCmds)); err != nil {
ctx.Log.Warn("unable to update apply commit status: %s", err)
}
}
chenrui333 marked this conversation as resolved.
Show resolved Hide resolved

// discard previous plans that might not be relevant anymore
ctx.Log.Debug("deleting previous plans and locks")
p.deletePlans(ctx)
Expand Down
Loading