[1.17] Merge from 1.16#414
Merged
dagood merged 5 commits intoFeb 9, 2022
Merged
Conversation
* Create source archive during CI * Update go-infra for createbuildassetjson src archive support (cherry picked from commit 3365189)
edc6a22 to
4a14e62
Compare
jaredpar
approved these changes
Feb 9, 2022
Member
Author
|
Auto-retries are only implemented in the build step, not test. Filed #415 to potentially add more retrying. I'll hit the AzDO retry button, for now. (Unfortunately, hit yet again with AzDO not allowing me to retry a failed job until all jobs in the stage have completed or been canceled.) |
This was referenced Feb 9, 2022
This file contains hidden or 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
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.
Making this PR went like this:
git mergefrom 1.16 in a dev branch.git reset -- go,git merge --continue.git go-patch applyto start the patch fixup process.git am -3to start a three-way merge.amcompleted without any more input.git go-patch extractto rewrite the patch file with the fixup.git-go-patch. Pushed a fix (with explanation in comment): microsoft/go-infra@e19d885. Then re-ran the process fromgit go-patch apply.