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

Add automerge capability #457

Merged
merged 2 commits into from
Feb 7, 2019
Merged

Add automerge capability #457

merged 2 commits into from
Feb 7, 2019

Conversation

lkysow
Copy link
Member

@lkysow lkysow commented Feb 6, 2019

Automerge merges pull requests if all plans have been applied successfully.

Can be enabled via the --automerge flag or a top-level automerge: true key in atlantis.yaml.

Notes:

@codecov
Copy link

codecov bot commented Feb 6, 2019

Codecov Report

Merging #457 into master will decrease coverage by 0.24%.
The diff coverage is 70.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #457      +/-   ##
==========================================
- Coverage   70.78%   70.53%   -0.25%     
==========================================
  Files          63       63              
  Lines        3987     4243     +256     
==========================================
+ Hits         2822     2993     +171     
- Misses        970     1028      +58     
- Partials      195      222      +27
Impacted Files Coverage Δ
server/events/yaml/valid/valid.go 93.54% <ø> (ø) ⬆️
server/events/project_command_builder.go 84.47% <ø> (ø) ⬆️
cmd/server.go 78.94% <ø> (ø) ⬆️
server/events/vcs/common/common.go 100% <ø> (ø)
...r/events/vcs/bitbucketserver/request_validation.go 58.82% <ø> (ø) ⬆️
server/user_config.go 100% <ø> (ø) ⬆️
testdrive/utils.go 0% <0%> (ø) ⬆️
server/locks_controller.go 87.14% <0%> (-2.57%) ⬇️
server/events/vcs/proxy.go 28.57% <0%> (-2.2%) ⬇️
server/events/pull_closed_executor.go 89.74% <0%> (-4.86%) ⬇️
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c6b87d...74e9bbb. Read the comment docs.

Hoping that this is more stable.
Automerging merges pull requests automatically if all plans have been
successfully applied.

* Save status of PR's to BoltDB so after each apply, we can check if
there are pending plans.
* Add new feature where we delete successful plans *unless* all plans
have succeeded *if* automerge is enabled. This was requested by users
because when automerge is enabled, they want to enforce that a pull
request's changes have been fully applied. They asked that plans not be
allowed to be applied "piecemeal" and instead, all plans must be
generated successfully prior to allowing any plans to be applied.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant