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 new --checkout-strategy flag #427

Merged
merged 4 commits into from
Jan 17, 2019
Merged

Add new --checkout-strategy flag #427

merged 4 commits into from
Jan 17, 2019

Commits on Jan 15, 2019

  1. Provide base branch name in pull request model

    This is needed in order to support the ability to check out the repo as
    it would appear after the pull request is merged into the base branch.
    lkysow committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    d2abdb5 View commit details
    Browse the repository at this point in the history
  2. Add checkout-strategy flag.

    This flag can be set to either branch (default) or merge. If set to
    branch, we will check out the head branch of the pull request (the
    source). If set to merge, we will check out the base branch of the pull
    request (the destination) and then attempt to perform a git merge of the
    pull request branch. This simulates what will happen if the pull request
    is merged.
    
    This allows us to perform terraform commands on what the state of the
    repo will be *after* the pull request is merged. This is useful if users
    are often opening up pull requests from branches that aren't up to date
    with master. With the branch strategy, the terraform plan might be
    deleting resources that have been created in the master branch but with
    the merge strategy, we merge the branch's changes into the master branch
    and so don't have this problem.
    lkysow committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    8b77b95 View commit details
    Browse the repository at this point in the history
  3. Fix gometalinter errors

    Also disable test linters since we already run tests.
    lkysow committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    501db6b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. Test new checkout logic.

    lkysow committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    16a4946 View commit details
    Browse the repository at this point in the history