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.

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

Normalize RepoRoot to include trailing slash #7498

Merged
merged 11 commits into from
Jun 10, 2021
Merged

Conversation

ViktorHofer
Copy link
Member

The Arcade SDK defines the RepoRoot repository with a trailing slash but the build scripts (build.ps1 and build.sh) pass in the property without a trailing slash which makes the use of it inconsistent and led to this source build patch: https://github.com/dotnet/runtime/blob/23e4735e5cc9956d3f3b351a252f0b1622a14cec/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch.

Normalizing the variable in the build scripts so that the property always contains the trailing slash.

To double check:

The Arcade SDK defines the RepoRoot repository [with a trailing slash](https://github.com/dotnet/arcade/blob/e81d8c9bdc1de22623657afb23fab210dd04ca82/src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props#L23) but the build scripts (build.ps1 and build.sh) pass in the property without a trailing slash which makes the use of it inconsistent and led to this source build patch: https://github.com/dotnet/runtime/blob/23e4735e5cc9956d3f3b351a252f0b1622a14cec/eng/source-build-patches/0004-Add-trailing-path-separator-to-repo_root.patch.

Normalizing the variable in the build scripts so that the property always contains the trailing slash.
Copy link
Member

@MichaelSimons MichaelSimons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this.

@ViktorHofer ViktorHofer merged commit a419173 into main Jun 10, 2021
@ViktorHofer ViktorHofer deleted the ViktorHofer-patch-2 branch June 10, 2021 15:41
@riarenas
Copy link
Member

@ViktorHofer This seems to have broken the official build: https://dev.azure.com/dnceng/internal/_build/results?buildId=1181292&view=results

@ViktorHofer
Copy link
Member Author

Oh no :( Should I send a follow-up change?

@riarenas
Copy link
Member

I haven't had a chance to dig in just yet, so if it's obvious please do, if not we can revert while we figure it out

@riarenas
Copy link
Member

OOOh, actually, let's hold for a minute. I'm seeing this exact same error in other places, which makes me think it's not the change.

@riarenas
Copy link
Member

oh, nevermind, it's definitely this change, I forgot for a minute that the publishing pipeline uses arcade main. We need to revert this change asap because it's failing publishing for everyone.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants