Add support for pending merge refs #208
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
ofalvai
commented
Feb 24, 2023
| @@ -67,24 +62,3 @@ func (c checkoutPRDiffFile) do(gitCmd git.Git, fetchOptions fetchOptions, fallba | |||
| func (c checkoutPRDiffFile) getBuildTriggerRef() string { | |||
| return "" | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Moved to bitriseapi package
ofalvai
commented
Feb 24, 2023
| @@ -374,6 +374,7 @@ workflows: | |||
| envman add --key TEST_DIFF_REPO_URL --value ${GIT_DIR} | |||
| envman add --key TEST_DIFF_PR_REPOSITORY_URL --value ${PR_GIT_DIR} | |||
| envman add --key BITRISE_BUILD_URL --value "file://${DIFF_DIR}" | |||
| envman add --key BITRISE_BUILD_API_TOKEN --value "dummy token" | |||
There was a problem hiding this comment.
BITRISE_BUILD_URL and BITRISE_BUILD_API_TOKEN should both be defined or none of them
ofalvai
commented
Feb 24, 2023
| @@ -1,4 +1,4 @@ | |||
| package gitclone | |||
| package tracker | |||
There was a problem hiding this comment.
I had to move this to its own subpackage because I introduced an import cycle (by using the tracker not only in gitclone, but in gitclone/bitriseapi too)
ofalvai
commented
Feb 27, 2023
| PRHeadBranch string | ||
|
|
||
| ResetRepository bool | ||
| BuildURL string | ||
| BuildAPIToken string |
There was a problem hiding this comment.
These are no longer needed here in the Config struct because we have instances of bitriseapi.PatchSource and bitriseapi.MergeRefChecker that contain these params.
godrei
reviewed
Mar 13, 2023
| } | ||
|
|
||
| func (s apiPatchSource) GetPRPatch() (string, error) { | ||
| if s.buildURL == "" { |
There was a problem hiding this comment.
Same as above shouldn't we do the validation in the constructor?
godrei
approved these changes
Mar 17, 2023
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.
Checklist
step.ymlandREADME.mdis updated with the changes (if needed)Version
Requires a MAJOR/MINOR/PATCH version update
Context
Related webhook processor PR: bitrise-io/bitrise-webhooks#128
This PR adds support for handling pending merge refs, which need to be verified before using for the checkout.
Changes
pull_request_unverified_merge_branch. This is automatically filled by the environment just likepull_request_merge_branch.MergeRefCheckerthat polls the Bitrise API a few times, which in turn asks/triggers the git provider to refresh the merge ref. If the merge ref is up-to-date, we use it for checkouts just like before. If the checker times out, or there is an error, we use the usual fallback checkout methods (most of the time it's fetching the PR source and destination branch and doing the merge manually)bitriseapipackage for Bitrise API specific stuff, such as this new merge ref checker and the PR patch file downloader.Investigation details
Decisions