Runtime: Upgrade mirror to Run for multiple branches (Release and Master branches)

Created on 20 Apr 2018 · 17Comments · Source: dotnet/runtime

We have noticed there are several commits missing in the coreclr release/2.1 branch that exists in corefx release/2.1 branch.

This means the mirror is not running on the release/2.1 branch and only runs on master.

This could lead to unexpected bugs in the product. For example, this PR just got opened for master, but corefx/2.1 and coreclr/2.1 are out of sync: https://github.com/dotnet/coreclr/pull/17709

cc @weshaggard, @RussKeldorph, @joshfree, @Anipik, @safern

area-Infrastructure-libraries

Source

ahsonkhan

👍1

All 17 comments

The mirror's code will need to be updated to be able to specify branches we want to mirror across repos and then the mirror will have to listen to all branches that it has in the settings file to update them if needed. Shouldn't be hard, but it is still a code change. Currently I don't have bandwidth to do it, but maybe @Anipik could do it.

safern on 20 Apr 2018

cc: @danmosemsft

safern on 20 Apr 2018

@safern @danmosemsft I can take a look at the mirror code to do that

Anipik on 21 Apr 2018

@danmosemsft ran the mirror manually for the 2.1 branches: https://github.com/dotnet/corefx/pull/29256 / https://github.com/dotnet/coreclr/pull/17713

Changing to blocking-release rather than blocking-RC1.

ahsonkhan on 24 Apr 2018

@ahsonkhan @Anipik whats the status here? We are running out of time in 2.1.

Petermarcu on 9 May 2018

@Petermarcu The changes are in testing phase.
During my last conversation with @danmosemsft we were not sure if we want to start running the new mirror for 2.1

Anipik on 9 May 2018

Are we out of sync or are we fine for 2.1? @danmosemsft

Petermarcu on 9 May 2018

We should be manually syncing for 2.1 release. This is essentially only relevant to Span and Path. @anipik please manually diff and confirm they are in sync.

danmosemsft on 9 May 2018

@danmosemsft they are not in sync.
https://github.com/dotnet/coreclr/commit/df6249119586492a77a17a0218760c40bd1d4caf is missing from the corefx. Rest all is good. should i add it manually ?

Anipik on 9 May 2018

dotnet/coreclr@df62491 is missing from the corefx

https://github.com/dotnet/corefx/pull/29611 shouldn't have any impact, as it's mirrored as part of the common folder but it's not built into anything in corefx, e.g.

d:\repos\corefx\src>findstr /s /c:"Number.Parsing.cs" *.csproj

d:\repos\corefx\src>

stephentoub on 9 May 2018

Even though it's not built I suggest sending mail to shiproom @anipik with the usual template so we can get the ok to merge this as theres value in a consistent state.
@anipik please check the diff each day from now until we ship or you have the mirror working.

danmosemsft on 9 May 2018

👍1

Can we close this one now? We did the manual merge?

Petermarcu on 10 May 2018

shouldnt we just move the milestone to the future as we are currently working to run the mirror for multiple branches ?

Anipik on 10 May 2018

That would be fine too. We'd have to change the title as well then and remove the "blocking-release" tag. My goal is to get it off the radar of things blocking 2.1.

Petermarcu on 10 May 2018

👍1