fix: broken automerge logic #3591
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks like https://github.com/runatlantis/atlantis/actions/runs/5509408415/jobs/10042072699?pr=3591#step:4:162 is still failing and not running twice. Unsure if related. |
GenPage
approved these changes
Jul 10, 2023
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
* fix automerge logic. * address failing autoplan test with automerge
ijames-gc
pushed a commit
to gocardless/atlantis
that referenced
this pull request
Feb 13, 2024
* fix automerge logic. * address failing autoplan test with automerge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
Tests were broken after merging #3379 ; the logic for reconciling automerge between project and global levels was incorrect, as global settings were being used when project-level automerge was configured true. This change addresses the issue by passing project-level settings in whole if a project is being used.
why
To fix broken tests and broken automerge logic.
tests
references