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

Jump to bottom

fix: update FileWorkspace logic to use pull request refs only when PR number is specified #4851

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

fix: update FileWorkspace logic to use pull request refs only when PR number is specified #4851

wants to merge 7 commits into from
+13 −6

Commits on Aug 16, 2024

  1. - Updating FileWorkspace.GithubAppEnabled comment to specify updated … 

    …logic around prNumber=0.

- Updating mergeToBaseBranch to only look for PR refs if GitHub app is enabled _and_ the plan/apply includes a PR number, which can optionally be 0.
    @marcus-rev
    marcus-rev committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    0110a15 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Merge branch 'main' into fix-clone-for-github-app-no-pr-number

    @jamengual
    jamengual authored Aug 17, 2024
    Configuration menu
    Copy the full SHA
    180cd15 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge branch 'main' into fix-clone-for-github-app-no-pr-number

    @marcus-rev
    marcus-rev authored Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ceac026 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. - Updating another location that should check if there's a PR number … 

    …included in the API call. When checking out a branch directly without a PR number, HEAD should be fine vs HEAD^2.
    @marcus-rev
    marcus-rev committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    dd5d8a9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix-clone-for-github-app-no-pr-number

    @marcus-rev
    marcus-rev authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    406d905 View commit details
    Browse the repository at this point in the history

  3. - Skipping VCS update when there is no pull request associated with a… 

    … plan. This eliminates the following error in Atlantis server: 422 Validation Failed [{Resource:Status Field:sha Code:custom Message:sha must be a 40 character SHA1}]
    @marcus-rev
    marcus-rev committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    e7e5794 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. Merge branch 'main' into fix-clone-for-github-app-no-pr-number

    @X-Guardian
    X-Guardian authored Nov 2, 2024
    Configuration menu
    Copy the full SHA
    fc445e1 View commit details
    Browse the repository at this point in the history