NextVersion.txt and GitVersionConfig.yaml support for dynamic repositories #352

GeertvanHorrik · 2015-01-17T15:17:57Z

See #351

…ories to support NextVersion.txt

SimonCropp · 2015-01-17T15:19:33Z

obligatory "can this be tested?"...

GeertvanHorrik · 2015-01-17T15:20:15Z

I knew that question would come. As always, time and resources are limited, but I understand.

SimonCropp · 2015-01-17T15:22:00Z

:) think we r on the same page. your call. is this worth the effort to test or not?

GeertvanHorrik · 2015-01-17T15:22:49Z

Not really worth the effort, but will add them anyways. @JakeGinnivan already put in effort to make the repositories offline. I can add a few files to test it.

SimonCropp · 2015-01-17T15:28:54Z

@GeertvanHorrik thanks

…epositories

GeertvanHorrik · 2015-01-17T15:56:03Z

Unit tests added. I had to improve some generic methods as well to support creation of dynamic files in fixtures. I couldn't run because I get a invalid read/write on memory access thing, I assume this has to do with the latest update to libgit2sharp, but maybe you can double check / verify?

SimonCropp · 2015-01-17T16:28:15Z

can u rebase?

SimonCropp · 2015-01-17T16:28:39Z

i know how much u love to use git ;)

GeertvanHorrik · 2015-01-17T16:34:29Z

Not sure how I should do that once I have committed. I hope I don't have to revert commits?

SimonCropp · 2015-01-17T16:35:58Z

i can manually merge if it is too much hassle. just tell me if u dont have time

GeertvanHorrik · 2015-01-17T16:36:56Z

I am searching for info, but cannot find the right stuff. I think I should have chose rebase instead of merge when I pushed, but once it is already pushed I don't know how to rebase. Happy to do it, just need some guidance (link?).

GeertvanHorrik · 2015-01-17T16:37:41Z

$ git rebase pr/NextVersionForDynamicRepositories
Current branch pr/NextVersionForDynamicRepositories is up to date.

GeertvanHorrik · 2015-01-17T16:38:37Z

I have rebased on my master branch now. Is that better?

SimonCropp · 2015-01-17T16:40:52Z

github says still no automerge
prob best ref is https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

…into pr/NextVersionForDynamicRepositories Conflicts: GitVersionExe.Tests/GitPreparerTests.cs

GeertvanHorrik · 2015-01-17T16:44:24Z

Ah, just had to do a "git pull upstream master" :-)

SimonCropp · 2015-01-17T16:50:51Z

ok the merge is OK but the build server says no. is it building on your machine?

GeertvanHorrik · 2015-01-17T16:56:41Z

What does the build serve say now?

SimonCropp · 2015-01-17T22:15:15Z

Test(s) failed. LibGit2Sharp.EmptyCommitException : No changes; nothing to commit.
   at LibGit2Sharp.Repository.Commit(String message, Signature author, Signature committer, CommitOptions options)
   at LibGit2Sharp.RepositoryExtensions.Commit(IRepository repository, String message, Signature author, Signature committer)
   at GitTestExtensions.CreateFileAndCommit(IRepository repository, String relativeFileName, DateTimeOffset dateTimeOffset) in c:\BuildAgent\work\68ea6bfb44e5afb\GitVersionCore.Tests\Helpers\GitTestExtensions.cs:line 55
   at GitPreparerTests.WorksCorrectlyWithRemoteRepository(String branchName, String expectedBranchName, Boolean checkConfig) in c:\BuildAgent\work\68ea6bfb44e5afb\GitVersionExe.Tests\GitPreparerTests.cs:line 45
------- Stderr: -------
Created git repository at 'C:\BuildAgent\work\68ea6bfb44e5afb\GitVersionExe.Tests\bin\Release\TestRepositories\970a4ec4-4458-498e-9976-45fb6ca97e2b'

SimonCropp · 2015-01-17T22:15:46Z

Test(s) failed. LibGit2Sharp.EmptyCommitException : No changes; nothing to commit.
   at LibGit2Sharp.Repository.Commit(String message, Signature author, Signature committer, CommitOptions options)
   at LibGit2Sharp.RepositoryExtensions.Commit(IRepository repository, String message, Signature author, Signature committer)
   at GitTestExtensions.CreateFileAndCommit(IRepository repository, String relativeFileName, DateTimeOffset dateTimeOffset) in c:\BuildAgent\work\68ea6bfb44e5afb\GitVersionCore.Tests\Helpers\GitTestExtensions.cs:line 55
   at GitPreparerTests.WorksCorrectlyWithRemoteRepository(String branchName, String expectedBranchName, Boolean checkConfig) in c:\BuildAgent\work\68ea6bfb44e5afb\GitVersionExe.Tests\GitPreparerTests.cs:line 45
------- Stderr: -------
Created git repository at 'C:\BuildAgent\work\68ea6bfb44e5afb\GitVersionExe.Tests\bin\Release\TestRepositories\19d0296a-8071-4a50-96c3-b1b1923c6764'

GeertvanHorrik · 2015-01-18T09:47:24Z

Somehow I either get this:

System.AccessViolationException : Attempted to read or write protected memory. This is often an indication that other memory is corrupt.

-or-

No changes; nothing to commit.

Somehow something is screwed on my system. I tried deleting all bin/obj, but doesn't seem to help either. Continuing my quest...

SimonCropp · 2015-01-18T09:57:47Z

@GeertvanHorrik perhaps something to do with mismatching libgit files? although not sure how that could happen?

GeertvanHorrik · 2015-01-18T09:58:26Z

I deleted packages/bin/obj several times:

Checking out files that might be needed later in dynamic repository
  Trying to check out 'NextVersion.txt'
Checking out files that might be needed later in dynamic repository
  Trying to check out 'GitVersionConfig.yaml'
System.AccessViolationException : Attempted to read or write protected memory. This is often an indication that other memory is corrupt.

SimonCropp · 2015-01-18T09:59:55Z

do u have a stack trace?

GeertvanHorrik · 2015-01-18T10:00:22Z

   at NUnit.Framework.Assert.IncrementAssertCount()
   at NUnit.Framework.Assert.That(Object actual, IResolveConstraint expression, String message, Object[] args)
   at GitPreparerTests.WorksCorrectlyWithRemoteRepository(String branchName, String expectedBranchName, Boolean checkConfig) in GitPreparerTests.cs: line 62

GeertvanHorrik · 2015-01-18T10:00:53Z

btw. I am using x86 2.6.4 NUnit runner in R#.

GeertvanHorrik · 2015-01-18T10:03:22Z

I had to explicitly set the platform of R# unit test runner to x86.

GeertvanHorrik · 2015-01-18T10:10:44Z

The "LibGit2Sharp.EmptyCommitException : No changes; nothing to commit." is very random. Sometimes it works, sometimes it doesn't. Alsmost looks like async code that is not being awaited. Need to investigate the repository fixture.

GeertvanHorrik · 2015-01-18T10:13:53Z

Adding this to the fixture solves it:

        // GHK: 2015-01-18: I know it's very ugly, but somehow we need to retry here otherwise "there is nothing to commit"
        int retryCount = 3;
        while (retryCount > 0)
        {
            try
            {
                repository.Stage(randomFile);

                return repository.Commit(string.Format("Test Commit for file '{0}'", relativeFileName),
                    Constants.Signature(dateTimeOffset), Constants.Signature(dateTimeOffset));
            }
            catch (EmptyCommitException)
            {
                if (retryCount <= 0)
                {
                    throw;
                }

                Thread.Sleep(100);
            }

            retryCount--;
        }

I don't want to know what's happening under the hood ;-)

SimonCropp · 2015-01-18T10:14:23Z

@GeertvanHorrik i tried explicit 2.6.3 and x86 and could not repro. if u switch back to to 2.6.3 does it still happen?

SimonCropp · 2015-01-18T10:15:34Z

@nulltoken can u weigh in here? re LibGit2Sharp.EmptyCommitException : No changes; nothing to commit. ?

GeertvanHorrik · 2015-01-18T11:44:04Z

"number of inspection errors is too large: 1 "

What's that?

SimonCropp · 2015-01-18T11:45:13Z

@GeertvanHorrik resharper inspections

JakeGinnivan · 2015-01-18T11:45:26Z

@GeertvanHorrik runs r# inspections on the build server

GitTestExtensions.cs (1)
56: Use implicitly typed local variable declaration

Is the error

GeertvanHorrik · 2015-01-18T11:46:32Z

Cool, thanks. How do you run R# on the build server. Is it a TC thing or separate executable?

SimonCropp · 2015-01-18T11:46:32Z

GitVersionCore.Tests/Helpers/GitTestExtensions.cs

+        File.WriteAllText(randomFile, Guid.NewGuid().ToString());
+
+        // GHK: 2015-01-18: I know it's very ugly, but somehow we need to retry here otherwise "there is nothing to commit"
+        int retryCount = 3;


make this a var

SimonCropp · 2015-01-18T11:47:28Z

it is built into TC. but there is a command line

SimonCropp · 2015-01-18T11:48:34Z

GitVersionCore.Tests/Helpers/GitTestExtensions.cs

+        File.WriteAllText(randomFile, Guid.NewGuid().ToString());
+
+        // GHK: 2015-01-18: I know it's very ugly, but somehow we need to retry here otherwise "there is nothing to commit"
+        var retryCount = 3;


@JakeGinnivan @nulltoken thoughts on how to avoid doing this retry?

I have changed config based versioning branch to increment the commit time for each commit - 14487a0#diff-c7ff189f687fa58758611ef26120e6dcR8

Not sure if this would fix the issue.

@SimonCropp @JakeGinnivan EmptyCommitException is raised when the tree about to be committed matches the tree from the parent commit. This means that no modification has been detected. My guess is that is related to a known issue in libgit2 (see libgit2/libgit2sharp#688).

Meanwhile, in order to work around this, just make sure that your files are of random length

I already implemented random content, but we can also add random length as well. Doesn't libgit see a difference when the file contents are different but equal length?

@GeertvanHorrik Time is also a variable of the equation. See libgit2/libgit2sharp#688 (comment)

gep13 · 2015-01-18T11:51:58Z

@GeertvanHorrik You can find it here: https://chocolatey.org/packages/resharper-clt choco install resharper-clt we use it as part of the build process for ChocolateyGUI since we are using AppVeyor and not TeamCity. The version that is installed with TeamCity is slightly different to the command line version, but I have found the results to be very similar in what they turn up. The command line version is driven by a config file that specifies files to exclude etc.

GeertvanHorrik · 2015-01-18T11:56:55Z

Thanks for all the info, will incorporate that into all my builds tomorrow as well.

gep13 · 2015-01-18T11:59:58Z

If you are interested, the ChocolateyGUI build process for both InspectCode and DupFinder starts here:

https://github.com/chocolatey/ChocolateyGUI/blob/develop/BuildScripts/default.ps1#L395

I create a very basic HTML file from the generated XML file (this is really what TeamCity does for you automagically) to make deciphering the output a bit easier. Feel free to borrow and extend them if you want.

JakeGinnivan · 2015-02-14T11:32:59Z

Have manually merged into #364

Also fixed the retry hack by appending a changing number of .'s after the guid contents

GeertvanHorrik added 2 commits January 17, 2015 16:14

#351 Fall back to default branch if not specified for dynamic reposit…

9e0b0cb

…ories to support NextVersion.txt

#351 Added support for GitVersionConfig.yaml

a66119e

#351 Improved unit tests to support configuration checks in dynamic r…

d556d5b

…epositories

Merge branch 'master' of https://github.com/ParticularLabs/GitVersion …

7f3394c

…into pr/NextVersionForDynamicRepositories Conflicts: GitVersionExe.Tests/GitPreparerTests.cs

Build fix

d8d7593

Fixed unit tests for dynamic repositories

e42b013

SimonCropp reviewed Jan 18, 2015
View reviewed changes

Resharper fix

f6741a8

SimonCropp reviewed Jan 18, 2015
View reviewed changes

JakeGinnivan closed this Feb 14, 2015

NextVersion.txt and GitVersionConfig.yaml support for dynamic repositories #352

NextVersion.txt and GitVersionConfig.yaml support for dynamic repositories #352

Uh oh!

Conversation

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

SimonCropp commented Jan 17, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

JakeGinnivan commented Jan 18, 2015

Uh oh!

GeertvanHorrik commented Jan 18, 2015

Uh oh!

SimonCropp Jan 18, 2015

Choose a reason for hiding this comment

Uh oh!

SimonCropp commented Jan 18, 2015

Uh oh!

SimonCropp Jan 18, 2015