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

Delete source branch on merge #1357

Merged
merged 57 commits into from
Apr 22, 2021
Merged

Delete source branch on merge #1357

merged 57 commits into from
Apr 22, 2021

Conversation

tapaszto
Copy link
Contributor

@tapaszto tapaszto commented Jan 19, 2021

This is a new feature for Azure DevOps which allows configuring the deletion of the source branch on merge according to the values in the server config and repo config.

Sample server config:

repos:
- id: /.*/
  workflow: default
  allow_custom_workflows: false
  allowed_overrides: [delete_source_branch_on_merge]
  delete_source_branch_on_merge: true

Sample repo config:

version: 3
automerge: true
delete_source_branch_on_merge: true
projects:
- name: my-test-project
  dir: .
  terraform_version: v0.11.0
  delete_source_branch_on_merge: true
  autoplan:
    when_modified: ["*.tf", "../modules/**.tf"]
    enabled: true

delete_source_branch_on_merge is optional in all level, the default value is false if it's not defined in a level
valid values: true | false | not defined

@tapaszto
Copy link
Contributor Author

Hi @nishkrishnan & @lkysow,
I performed the requested modifications, can you approve the PR please?

@Dilergore
Copy link

@nishkrishnan & @lkysow,

Please review this. This is the only change we need to get back to the official Atlantis instead of having our fork internally.

Thanks!

@tapaszto
Copy link
Contributor Author

tapaszto commented Mar 8, 2021

Hi @acastle,

Could you help us to review this branch? We performed the requested refactoring and answered for the open items.

@tapaszto
Copy link
Contributor Author

Hi @nishkrishnan, @lkysow, @acastle,
Do You need any further actions from our side in order to get this PR merged? Our company is waiting for this feature to be able to use the official community version instead of our own fork. Can You give a contact person please?

Copy link
Contributor

@acastle acastle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@acastle acastle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tapaszto sorry for the delay here. The code changes look good, could you resolve the conflicts in project_command_builder.go and then we can move this forward.

@tapaszto tapaszto requested a review from a team as a code owner March 26, 2021 10:16
@tapaszto
Copy link
Contributor Author

Hi @acastle,
Thanks for approving. I resolved the conflict, could you check it please?

@nishkrishnan nishkrishnan added waiting-on-review Waiting for a review from a maintainer and removed waiting-on-response Waiting for a response from the user labels Mar 31, 2021
@tapaszto
Copy link
Contributor Author

tapaszto commented Apr 9, 2021

Hi @nishkrishnan,

Do you need anything from us to get this PR merged?

@Dilergore
Copy link

@nishkrishnan, @acastle, @lkysow Could you guys please take a look ASAP? We would like to merge this finally.

Thanks!

@Dilergore
Copy link

@nishkrishnan, @acastle, @lkysow any update? We needed to merge in updates multiple times by now, we cannot continue this forever. Please review and merge this, it should be up to date now for a merge.

@tapaszto
Copy link
Contributor Author

@nishkrishnan, @acastle, @lkysow, guys, can you approve this PR please? Keeping this branch up-to-date and update it whenever the master is changed is an extreme overhead for us. Our primary goal is using the official community Atlantis releases instead of our own internal fork. Using Atlantis is a strategic decision regarding our Azure IaC deployments within the company

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
waiting-on-review Waiting for a review from a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants