Fix PR builds ran manually or against release branches #40186
Merged
Conversation
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
ghost
added
joeloff
approved these changes
Apr 15, 2024
Member
Author
|
/backport to release/8.0.1xx |
Contributor
|
Started backporting to release/8.0.1xx: https://github.com/dotnet/sdk/actions/runs/8743776195 |
Contributor
|
@MiYanni backporting to release/8.0.1xx failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Clean up extraneous whitespace.
Using index info to reconstruct a base tree...
M eng/build-pr.yml
M eng/build.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/build.yml
CONFLICT (content): Merge conflict in eng/build.yml
Auto-merging eng/build-pr.yml
CONFLICT (content): Merge conflict in eng/build-pr.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Clean up extraneous whitespace.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@MiYanni an error occurred while backporting to release/8.0.1xx, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
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.
Summary
Currently, if you manually go and run a PR build in our PR pipeline, it will fail. Why? Because the information provided for signing won't function for Ubuntu and Darwin builds. The build is incorrectly setting PostBuildSign to
falsefor these builds. This also applies to builds whenreleasebranches are merged. Those also fail for the same reason.To fix this, I believe the intent of this logic was only supposed to apply for
internalbuilds. Thus, I've added this to the condition. Now, PostBuildSign will only befalseif it is both an internal build (not this pipeline) AND it is either areleasebranch or if the pipeline is ran manually. Lastly, I did some whitespace cleanup too.Failure Examples
releasebranch build: https://dev.azure.com/dnceng-public/public/_build/results?buildId=643153Test Build