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.

Sign up for GitHub

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

Jump to bottom

Mainline development mode #950

Merged
merged 9 commits into from
Jul 20, 2016
Merged

Mainline development mode #950

merged 9 commits into from
Jul 20, 2016

Conversation

JakeGinnivan
Copy link
Contributor

This builds on top of #832

It's pretty rough but will ship this as part of 4.0.0 beta if it looks ok

@pascalberger
Copy link
Member

The branching strategy images still contain -unstable tags. Since alpha is the default in this PR I would change this in the images too.

pascalberger
pascalberger reviewed Jul 16, 2016
View reviewed changes
src/GitVersionCore/AssemblyInfo.cs
using System.Runtime.CompilerServices;

[assembly: AssemblyTitle("GitVersionCore")]
[assembly: AssemblyProduct("GitVersion")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("1.0.0")]
[assembly: AssemblyVersion("4.0.0.0")]
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this set through GitVersion in the build process and should be kept to 1.0.0 in the repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ran build script locally, forgot to reset these changes

@pascalberger
Copy link
Member

We should also make sure to document the new mainline mode properly. There is already a mainline documentation available which should be updated with these changes.

@JakeGinnivan JakeGinnivan mentioned this pull request Jul 19, 2016
Closed
stocksr
stocksr reviewed Jul 19, 2016
View reviewed changes
docs/versioning-mode.md

## Mainline development
Mainline development works more like the Continuous Delivery mode, except that it tells GitVersion to *infer* releases from from event.
Copy link

Choose a reason for hiding this comment

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

typo: from from

@aarondandy
Copy link

aarondandy commented Jul 19, 2016 •
edited
Loading

I did a local build and tried it out, worked great and as expected during my quick testing.

My 🍠

assembly-versioning-scheme: MajorMinorPatch
mode: Mainline
branches:
  master:
    tag: ''
ignore:
  sha: []

I did get two test failures though when running build.ps1:
Test Count: 451, Passed: 449, Failed: 2, Inconclusive: 0, Skipped: 0

1) Error : ConfigProviderTests.CanWriteOutEffectiveConfiguration
Shouldly.ShouldAssertException : Cannot find a difftool to use, please open an issue or a PR to add support for your dif
ftool.

2) Error : DocumentationTests.ConfigurationDocumentationIsUpToDate
Shouldly.ShouldAssertException : configurationDocumentationFile
    should contain (case insensitive comparison)
"**`no-bump-message:`**"
    but was actually
"# Configuration
GitVersion 3.0 is mainly powered by configuration and no longer has branching strat..."

@JakeGinnivan JakeGinnivan mentioned this pull request Jul 19, 2016
Merged
@JakeGinnivan JakeGinnivan merged commit 22e0342 into GitTools:master Jul 20, 2016
@JakeGinnivan JakeGinnivan deleted the MainlineDevelopmentMode branch July 20, 2016 00:40
@asbjornu asbjornu mentioned this pull request Sep 22, 2022
Closed
@HHobeck HHobeck mentioned this pull request Feb 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JakeGinnivan @pascalberger @aarondandy @stocksr