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

Add local + CI for source-build build infra #352

Merged
merged 1 commit into from Mar 3, 2021

Conversation

omajid
Copy link
Member

@omajid omajid commented Feb 3, 2021

This enables 'source-build', which makes it easier to build the entire shipping .NET SDK from source.

This is the first step of arcade-powered-source-build:
https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/README.md

See dotnet/sourcelink#692 for a similar PR, that this is based on.

cc @dagood

@dagood
Copy link
Member

dagood commented Feb 3, 2021

Thanks @omajid! 😄

@vijayrkn, PTAL when you have a chance. This PR includes the arcade-powered source-build CI enable flag, so you might want to run a mock official build to validate it before merging to be sure it works internally: https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/onboarding/ci-onboarding.md#end-result

@omajid
Copy link
Member Author

omajid commented Feb 3, 2021

Oh, I forgot to add some patches that source-build is currently carrying. They ought to be part of this PR too. Will update this shortly. Already merged.

Thanks, @dagood for reminding me!

@omajid
Copy link
Member Author

omajid commented Feb 3, 2021

Actually, nevermind. Both the patches here have been merged here already via #164

@omajid omajid force-pushed the source-build-local-build-infra branch from 8832948 to b9324da Compare February 3, 2021 22:48
@omajid omajid changed the title Add local source-build build infra Add local + CI for source-build build infra Feb 3, 2021
@@ -4,6 +4,7 @@
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21101.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true"/>
Copy link
Member Author

@omajid omajid Feb 3, 2021

Choose a reason for hiding this comment

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

@dagood Is arcade available as a source-build dep? I just realized that https://github.com/dotnet/sourcelink/blob/master/eng/Version.Details.xml doesn't have this.

Should I delete this line from this PR?

Copy link
Member

Choose a reason for hiding this comment

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

This line is should stay--the reason sourcelink can't depend on arcade is that arcade depends on sourcelink. There isn't always perfect logic in how we break the circular dependencies, this is just based on how we did it in .NET 5 and earlier, graphed out in the SVG at https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/implementation-plan.md

(If arcade wasn't available, I think the CI would fail to restore the Microsoft.SourceBuild.Intermediate.arcade package.)

Copy link
Member

@dagood dagood Feb 3, 2021

Choose a reason for hiding this comment

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

the reason sourcelink can't depend on arcade is that arcade depends on sourcelink

This is actually interesting, in theory source-built sourcelink can depend on source-built arcade, now that the work on arcade stage 3 is done. Maybe we should actually end up doing that to be even more sure that source-built versions of arcade will work in that repo. In any case, that's separate from this PR: filed dotnet/source-build#2022 to follow up.

omajid added a commit to omajid/xliff-tasks that referenced this pull request Feb 9, 2021
This enables 'source-build', which makes it easier to build the entire
shipping .NET SDK from source.

This is the first and second step of arcade-powered-source-build:
https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/README.md

See dotnet/xdt#352 for a similar PR, that this is based on.
dagood pushed a commit to dotnet/xliff-tasks that referenced this pull request Feb 10, 2021
This enables 'source-build', which makes it easier to build the entire
shipping .NET SDK from source.

This is the first and second step of arcade-powered-source-build:
https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/README.md

See dotnet/xdt#352 for a similar PR, that this is based on.
@omajid omajid force-pushed the source-build-local-build-infra branch from b9324da to 2586e10 Compare February 24, 2021 00:09
@omajid
Copy link
Member Author

omajid commented Feb 24, 2021

Hey, @vijayrkn, can you please review this when you get a chance?

@MichaelSimons
Copy link
Member

@omajid, whenever it is convenient, can you pull in master and resolve the Version.Details.xml conflict? I would do it for you but I don't have access 😸

This enables 'source-build', which makes it easier to build the entire
shipping .NET SDK from source.

This is the first and second step of arcade-powered-source-build:
https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/README.md

See dotnet/sourcelink#692 for a similar PR, that
this is based on.
@omajid omajid force-pushed the source-build-local-build-infra branch from 2586e10 to 4511f52 Compare March 3, 2021 00:29
@vijayrkn vijayrkn merged commit f446956 into dotnet:master Mar 3, 2021
@omajid
Copy link
Member Author

omajid commented Mar 3, 2021

Thanks for reviewing and merging this!

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.

None yet

4 participants