change prerelease tag to local.timestamp when building locally #2069

jetersen · 2020-01-30T23:03:32Z

src/GitVersionCore/GitVersionFinder.cs

jetersen · 2020-01-31T06:29:24Z

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -77,6 +78,12 @@ public SemanticVersion FindVersion(GitVersionContext context)
                }
            }

+            if (context.IsLocalBuild && taggedSemanticVersion == null && context.Repository.RetrieveStatus().IsDirty)


This is why this is superior to our current solution we have with our own msbuild target.
We can check if the repo is dirty in GitVersion 😍

cc @zionyx

Though I wonder if that's what we want.
We properly want to have all local build marked with local.timestamp when I think about our use case for local nuget repository source.

jetersen · 2020-01-31T06:34:18Z

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -33,7 +33,8 @@ public void RunExecViaCommandLine()
            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, ExecCommand.BuildTool, "RunExecViaCommandLine.csproj /target:OutputResults");

            result.ExitCode.ShouldBe(0, result.Log);
-            result.Log.ShouldContain("GitVersion_FullSemVer: 1.2.4+1");
+            var now = DateTime.Now.ToString("yyyyMMddHH");
+            result.Log.ShouldMatch($".+GitVersion_FullSemVer: 1.2.4-local.{now}\\d+\\+1.+");


great we already had a test that constituted as a dirty repo 😍

Should properly add a dirty one and none dirty? to see when build is local 👍

asbjornu

I'm not sure I understand the rationale behind this change. Why would you want a new version number every hour when building locally? One of GitVersion's strengths imho is being able to generate the same version number for the same commit on the same branch no matter where it is being built. This seems to break that premise.

asbjornu · 2020-02-12T08:54:13Z

src/GitVersionCore/GitVersionCalculator.cs

@@ -75,13 +76,13 @@ private string ResolveCurrentBranch(IBuildServer buildServer, string targetBranc
            return currentBranch;
        }

-        private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache)
+        private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, bool isCiBuild)


Shouldn't we stick to either isLocalBuild or isCiBuild to avoid confusion?

Suggested change

private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, bool isCiBuild)

private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, bool isLocalBuild)

Was indecisive on wording I think isLocalBuild is best. I must have missed this one.

jetersen · 2020-02-12T09:03:28Z

@asbjornu the hour thing is only for tests that ignores minutes and seconds cause it would be cause test failures.

The local version number is timestamped down to seconds so everytime you build you will get a new package version with the new version.

Together with custom PackageOutputPath and GeneratePackageOnBuild this will generate a new package with a new timestamp that you can use in your local package source.

The desire for this is ease local development between libraries.

jetersen · 2020-02-12T09:07:10Z

I will agree that this may not be something for GitVersion to accept as it is very different premise.

Perhaps it could be hidden behind a GitVersion configuration otherwise we will continue to use our current solution we have in our specialized msbuild targets.

arturcic · 2020-02-12T09:07:20Z

@asbjornu the hour thing is only for tests that ignores minutes and seconds cause it would be cause test failures.

The local version number is timestamped down to seconds so everytime you build you will get a new package version with the new version.

Together with custom PackageOutputPath and GeneratePackageOnBuild this will generate a new package with a new timestamp that you can use in your local package source.

The desire for this is ease local development between libraries.

To be honest I don't think we need to cover this specific scenario

arturcic · 2020-02-12T09:08:40Z

@asbjornu the hour thing is only for tests that ignores minutes and seconds cause it would be cause test failures.
The local version number is timestamped down to seconds so everytime you build you will get a new package version with the new version.
Together with custom PackageOutputPath and GeneratePackageOnBuild this will generate a new package with a new timestamp that you can use in your local package source.
The desire for this is ease local development between libraries.

To be honest I don't think we need to cover this specific scenario

This specific scenario should be handled outside of the GitVersion tool

jetersen · 2020-02-12T09:12:54Z

No worries, thanks for taking the time to review the PR ❤️

asbjornu · 2020-02-12T09:21:21Z

I think #1385 points to a direction you might take to solve this, @Casz. See assembly-file-versioning-format for details. It may not support your exact use-case now, but a continuation of it in the right direction might and will be more likely to be something we'll accept and merge.

jetersen · 2020-02-12T09:48:38Z

Thanks may look into assembly-file-versioning-format and whether it is helpful 😅

jetersen added 2 commits January 31, 2020 00:03

change prerelease tag to local.timestamp when building locally

0508819

check taggedSemanticVersion and whether repository is dirty

7f70435

jetersen commented Jan 31, 2020

View reviewed changes

src/GitVersionCore/GitVersionFinder.cs Outdated Show resolved Hide resolved

test that local matches down to the hour

95076a8

jetersen commented Jan 31, 2020

View reviewed changes

This comment has been minimized.

Sign in to view

jetersen marked this pull request as ready for review January 31, 2020 06:33

jetersen commented Jan 31, 2020

View reviewed changes

jetersen mentioned this pull request Jan 31, 2020

Increment version number when local changes are detected #1570

Closed

asbjornu added 3 commits February 11, 2020 10:54

Merge branch 'master' into fix/localBuild

7c21ec6

Merge branch 'master' into fix/localBuild

1babc52

Merge branch 'master' into fix/localBuild

aac0f92

asbjornu requested changes Feb 12, 2020

View reviewed changes

jetersen closed this Feb 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

change prerelease tag to local.timestamp when building locally #2069

change prerelease tag to local.timestamp when building locally #2069

Uh oh!

jetersen commented Jan 30, 2020 •

edited

Loading

Uh oh!

Uh oh!

jetersen Jan 31, 2020

Uh oh!

jetersen Jan 31, 2020

Uh oh!

This comment has been minimized.

jetersen Jan 31, 2020 •

edited

Loading

Uh oh!

jetersen Jan 31, 2020

Uh oh!

asbjornu left a comment

Uh oh!

asbjornu Feb 12, 2020

Uh oh!

jetersen Feb 12, 2020

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

arturcic commented Feb 12, 2020

Uh oh!

arturcic commented Feb 12, 2020 •

edited

Loading

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

asbjornu commented Feb 12, 2020

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

Uh oh!

	private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, bool isCiBuild)
	private VersionVariables GetCachedGitVersionInfo(string targetBranch, string commitId, Config overrideConfig, bool noCache, bool isLocalBuild)

change prerelease tag to local.timestamp when building locally #2069

change prerelease tag to local.timestamp when building locally #2069

Uh oh!

Conversation

jetersen commented Jan 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jetersen Jan 31, 2020

Choose a reason for hiding this comment

Uh oh!

jetersen Jan 31, 2020

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

jetersen Jan 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jetersen Jan 31, 2020

Choose a reason for hiding this comment

Uh oh!

asbjornu left a comment

Choose a reason for hiding this comment

Uh oh!

asbjornu Feb 12, 2020

Choose a reason for hiding this comment

Uh oh!

jetersen Feb 12, 2020

Choose a reason for hiding this comment

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

arturcic commented Feb 12, 2020

Uh oh!

arturcic commented Feb 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

asbjornu commented Feb 12, 2020

Uh oh!

jetersen commented Feb 12, 2020

Uh oh!

Uh oh!

jetersen commented Jan 30, 2020 •

edited

Loading

jetersen Jan 31, 2020 •

edited

Loading

arturcic commented Feb 12, 2020 •

edited

Loading