Skip to content

Additional Test to cover usage of main, instead of master #795

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

Merged
merged 1 commit into from
Feb 24, 2016

Conversation

gep13
Copy link
Member

@gep13 gep13 commented Feb 24, 2016

No description provided.

@gep13
Copy link
Member Author

gep13 commented Feb 24, 2016

@JakeGinnivan ok, so I did some digging into what I thought was an issue, namely this:

https://ci.appveyor.com/project/cakebuild/cake/build/0.9.1-main0001#L232

In the case of Cake, we don't have a master branch, we have a main branch. Within this PR #724 we removed the requirement to have a master branch, and I thought there was still an issue, as the wrong asserted version number was coming back.

However, digging into it, I see that I was missing the configuration in the yaml file, to specify the settings for that named branch.

In this PR, I have added another test, to cover the usage of the main branch, by providing the necessary branch configuration to make it happy.

Please let me know what you think.

JakeGinnivan added a commit that referenced this pull request Feb 24, 2016
Additional Test to cover usage of main, instead of master
@JakeGinnivan JakeGinnivan merged commit 43a3ab6 into GitTools:master Feb 24, 2016
@JakeGinnivan
Copy link
Contributor

Looks good.

The only scenario which may have issues is there are hard coded references to master in the inherit branch config for resolving when there are multiple matched branches. This should only affect a really small number of scenarios though, if any?

@gep13
Copy link
Member Author

gep13 commented Feb 25, 2016

@JakeGinnivan these were the two places that I found hard coded references to master:

ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);

var master = localBranchesWhereCommitShaIsHead.SingleOrDefault(n => n.Name == "master");

But I wasn't sure what needed to be done here.

Also, would it make sense to extend the test cases to include running them with save a dev and main branch? Making sure all the test cases pass, with a different branch configuration?

@gep13 gep13 deleted the UseMainInsteadOfMaster branch February 25, 2016 07:55
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.

2 participants