Skip to content

Change references from master to main#6259

Merged
benvillalobos merged 2 commits intodotnet:mainfrom
benvillalobos:rename-references-to-master
Mar 16, 2021
Merged

Change references from master to main#6259
benvillalobos merged 2 commits intodotnet:mainfrom
benvillalobos:rename-references-to-master

Conversation

@benvillalobos
Copy link
Copy Markdown
Member

@benvillalobos benvillalobos commented Mar 15, 2021

Fixes #6249

Context

This should finalize our master to main transition.

Changes Made

Remove master as a trigger.
exp/ branches should default to main for optprof data now.
Rename master to main in our primary readme file.

Notes

There are plenty of references to master in our documentation, but they'll forward to main so our links won't be broken.

Copy link
Copy Markdown
Contributor

@Forgind Forgind left a comment

Choose a reason for hiding this comment

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

I'd prefer to leave master as a trigger for a week or two until we've had a few successful insertions from main without manual interference. This seems unsafe if we need a hotfix but can't get anything into VS. Can dismiss if the balance is against me.

@benvillalobos
Copy link
Copy Markdown
Member Author

@Forgind I'm fine leaving this open until bare minimum one good VS insertion, but this PR should merge before any others.

The outages today have slowed progress on this. /cc: @AR-May when you're around, can you run a pipeline build on main? You'll need to set OptProfDrop to OptimizationData/dotnet/msbuild/master/20210312.1/980986/1 (latest optprof from master), and clear IbcSourceBranchName. If it succeeds, kick off a release on main and cross your fingers 🤞

/cc: @marcpopMSFT @ladipro @rokonec

@Forgind
Copy link
Copy Markdown
Contributor

Forgind commented Mar 15, 2021

Not opposed to merging this before anything else, short of a very high-priority fix.

As I understand the outages, we just have no way of running tests right now, so I don't think running the pipeline again would help more than just poking the current PR to run again.

@benvillalobos
Copy link
Copy Markdown
Member Author

@Forgind Could just be me, but I haven't noticed the outage affecting CI tests. Kick em both I say ¯_(ツ)_/¯

@Forgind
Copy link
Copy Markdown
Contributor

Forgind commented Mar 16, 2021

Not CI but look at the reasons for our errors:
https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/310761

@AR-May
Copy link
Copy Markdown
Member

AR-May commented Mar 16, 2021

@benvillalobos The VS insertion from main was successful. Crossed fingers helped.

@benvillalobos
Copy link
Copy Markdown
Member Author

@Forgind Merging is blocked on requested changes. Can you approve so we can get this and #6269 merged asap?

@benvillalobos benvillalobos merged commit c98a50f into dotnet:main Mar 16, 2021
@benvillalobos benvillalobos deleted the rename-references-to-master branch March 16, 2021 19:18
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.

Rename master to main

3 participants