Skip to content

Provide a way to translate the PreReleaseLabel (alpha, beta etc) to a numeric value to avoid version collisions #1433

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

Merged
asbjornu merged 8 commits into from
Feb 27, 2019
Merged

Provide a way to translate the PreReleaseLabel (alpha, beta etc) to a numeric value to avoid version collisions #1433

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d2ca54
Adding support to specify pre-release-weight for branch specific conf…
ruhullahshah Jun 28, 2018
d1b08af
Fixed failing testcases
ruhullahshah Jul 2, 2018
b27f4c9
Fix a minor nit in the documentation
ruhullahshah Jul 5, 2018
d6820b2
Provided default values for the pre-release-weight, add a testcase to…
Feb 20, 2019
8472bd4
Updated the docs
Feb 20, 2019
d5d71a7
Fixed compilation
Feb 27, 2019
5ca573f
Decrease the default pre-release-weight for final branches
Feb 27, 2019
db30469
Update the Wix approved file to accommodate the new variable
Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed failing testcases
  • Loading branch information
@ruhullahshah
ruhullahshah authored and Ruh Ullah Shah committed Feb 27, 2019
commit d1b08af3aa592d36feb7f20d0b4b3d58581fe536
1 change: 1 addition & 0 deletions src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"-unstable.4",
"PreReleaseLabel":"unstable",
"PreReleaseNumber":4,
"WeightedPreReleaseNumber":4,
"BuildMetaData":5,
"BuildMetaDataPadded":"0005",
"FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"-unstable.4",
"PreReleaseLabel":"unstable",
"PreReleaseNumber":4,
"WeightedPreReleaseNumber":4,
"BuildMetaData":5,
"BuildMetaDataPadded":"0005",
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...viderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"-unstable.4",
"PreReleaseLabel":"unstable",
"PreReleaseNumber":4,
"WeightedPreReleaseNumber":4,
"BuildMetaData":5,
"BuildMetaDataPadded":"05",
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...ved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"",
"PreReleaseLabel":"",
"PreReleaseNumber":"",
"WeightedPreReleaseNumber":"",
"BuildMetaData":5,
"BuildMetaDataPadded":"0005",
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...riableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"-unstable.5",
"PreReleaseLabel":"unstable",
"PreReleaseNumber":5,
"WeightedPreReleaseNumber":5,
"BuildMetaData":"",
"BuildMetaDataPadded":"",
"FullBuildMetaData":"Branch.develop.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...d/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"-ci.5",
"PreReleaseLabel":"ci",
"PreReleaseNumber":5,
"WeightedPreReleaseNumber":5,
"BuildMetaData":"",
"BuildMetaDataPadded":"",
"FullBuildMetaData":"Branch.develop.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...rovidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"PreReleaseTagWithDash":"",
"PreReleaseLabel":"",
"PreReleaseNumber":"",
"WeightedPreReleaseNumber":"",
"BuildMetaData":5,
"BuildMetaDataPadded":"0005",
"FullBuildMetaData":"5.Sha.commitSha",
Expand Down
1 change: 1 addition & 0 deletions ...nCore.Tests/Approved/cs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ static class GitVersionInformation
public static string PreReleaseTagWithDash = "-unstable.4";
public static string PreReleaseLabel = "unstable";
public static string PreReleaseNumber = "4";
public static string WeightedPreReleaseNumber = "4";
public static string BuildMetaData = "5";
public static string BuildMetaDataPadded = "0005";
public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
Expand Down
1 change: 1 addition & 0 deletions ...nCore.Tests/Approved/fs/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module GitVersionInformation
let PreReleaseTagWithDash = "-unstable.4"
let PreReleaseLabel = "unstable"
let PreReleaseNumber = "4"
let WeightedPreReleaseNumber = "4"
let BuildMetaData = "5"
let BuildMetaDataPadded = "0005"
let FullBuildMetaData = "5.Branch.feature1.Sha.commitSha"
Expand Down
1 change: 1 addition & 0 deletions ...nCore.Tests/Approved/vb/GitVersionInformationGeneratorTests.ShouldCreateFile.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ NotInheritable Class GitVersionInformation
Public Shared PreReleaseTagWithDash As String = "-unstable.4"
Public Shared PreReleaseLabel As String = "unstable"
Public Shared PreReleaseNumber As String = "4"
Public Shared WeightedPreReleaseNumber As String = "4"
Public Shared BuildMetaData As String = "5"
Public Shared BuildMetaDataPadded As String = "0005"
Public Shared FullBuildMetaData As String = "5.Branch.feature1.Sha.commitSha"
Expand Down
7 changes: 7 additions & 0 deletions src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ branches:
tracks-release-branches: true
is-release-branch: false
is-mainline: false
pre-release-weight: 0
master:
mode: ContinuousDelivery
tag: ''
Expand All @@ -36,6 +37,7 @@ branches:
tracks-release-branches: false
is-release-branch: false
is-mainline: true
pre-release-weight: 0
release:
mode: ContinuousDelivery
tag: beta
Expand All @@ -51,6 +53,7 @@ branches:
tracks-release-branches: false
is-release-branch: true
is-mainline: false
pre-release-weight: 0
feature:
mode: ContinuousDelivery
tag: useBranchName
Expand All @@ -68,6 +71,7 @@ branches:
tracks-release-branches: false
is-release-branch: false
is-mainline: false
pre-release-weight: 0
pull-request:
mode: ContinuousDelivery
tag: PullRequest
Expand All @@ -86,6 +90,7 @@ branches:
tracks-release-branches: false
is-release-branch: false
is-mainline: false
pre-release-weight: 0
hotfix:
mode: ContinuousDelivery
tag: beta
Expand All @@ -100,6 +105,7 @@ branches:
tracks-release-branches: false
is-release-branch: false
is-mainline: false
pre-release-weight: 0
support:
mode: ContinuousDelivery
tag: ''
Expand All @@ -112,6 +118,7 @@ branches:
tracks-release-branches: false
is-release-branch: false
is-mainline: true
pre-release-weight: 0
ignore:
sha: []
commit-date-format: yyyy-MM-dd
3 changes: 3 additions & 0 deletions src/GitVersionCore.Tests/ExecuteCoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void CacheFileExistsOnDisk()
PreReleaseTagWithDash: -test.19
PreReleaseLabel: test
PreReleaseNumber: 19
WeightedPreReleaseNumber: 19
BuildMetaData:
BuildMetaDataPadded:
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
Expand Down Expand Up @@ -161,6 +162,7 @@ public void ConfigChangeInvalidatesCache()
PreReleaseTagWithDash: -test.19
PreReleaseLabel: test
PreReleaseNumber: 19
WeightedPreReleaseNumber: 19
BuildMetaData:
BuildMetaDataPadded:
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
Expand Down Expand Up @@ -211,6 +213,7 @@ public void NoCacheBypassesCache()
PreReleaseTagWithDash: -test.19
PreReleaseLabel: test
PreReleaseNumber: 19
WeightedPreReleaseNumber: 19
BuildMetaData:
BuildMetaDataPadded:
FullBuildMetaData: Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
Expand Down
3 changes: 3 additions & 0 deletions src/GitVersionTask/GetVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ public GetVersion()
[Output]
public string PreReleaseNumber { get; set; }

[Output]
public string WeightedPreReleaseNumber { get; set; }

[Output]
public string BuildMetaData { get; set; }

Expand Down