Actually fix build id issue #14601
Merged
Actually fix build id issue #14601
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
Megamouse
reviewed
Sep 2, 2023
| @@ -91,7 +91,7 @@ for /F %%I IN ('call %GIT% rev-list HEAD --count') do set COMMIT_COUNT=%%I | |||
|
|
|||
| rem // Check if the current build system sets the git branch and version. | |||
| rem // The name is misleading. This is also used for master builds. | |||
| if defined SYSTEM_PULLREQUEST_SOURCEBRANCH ( | |||
There was a problem hiding this comment.
remove the line with the comment above
There was a problem hiding this comment.
Also remove the same comment in the else branch and adjust the echo with BUILD_SOURCEBRANCHNAME
| @@ -125,6 +125,7 @@ if defined SYSTEM_PULLREQUEST_SOURCEBRANCH ( | |||
| for /F %%I IN ('call %GIT% rev-parse --short^=8 HEAD') do set GIT_VERSION=%COMMIT_COUNT%-%%I | |||
| for /F %%I IN ('call %GIT% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%I | |||
|
|
|||
| set GIT_BRANCH=%BUILD_SOURCEBRANCHNAME% | |||
There was a problem hiding this comment.
I don't see why we need this
Megamouse
added
the
Build and CI
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.
Seems like Azure changed how it's SYSTEM_PULLREQUEST_SOURCEBRANCH works, and now is undefined if it's not a PR build.