Trying to get travis builds to pass

Author: JakeGinnivan

.travis.yml

@@ -8,6 +8,8 @@ os:
 before_install:
   - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
 script:
+  - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST
+  - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi)
   - ./build.sh
 cache:
   directories:

build.cake

@@ -58,10 +58,13 @@ Task("Version")
     .Does(() =>
 {
     string url = null;
+    string branch = null;
     // We need to use dynamic repositories on Travis
     if (TravisCI.IsRunningOnTravisCI)
     {
         url = "https://github.com/GitTools/GitVersion.git";
+        branch = EnvironmentVariable("BRANCH");
+        Information("Travis branch: {0}", branch);
     }
 
     GitVersion(new GitVersionSettings
@@ -70,13 +73,15 @@ Task("Version")
         LogFilePath = "console",
         OutputType = GitVersionOutput.BuildServer,
         ToolPath = @"src\GitVersionExe\bin\Release\GitVersion.exe",
-        Url = url
+        Url = url,
+        Branch = branch
     });
     GitVersion assertedVersions = GitVersion(new GitVersionSettings
     {
         OutputType = GitVersionOutput.Json,
         ToolPath = @"src\GitVersionExe\bin\Release\GitVersion.exe",
-        Url = url
+        Url = url,
+        Branch = branch
     });
 
     version = assertedVersions.MajorMinorPatch;

src/GitVersion.sln.DotSettings

@@ -549,6 +549,7 @@ II.2.12 <HandlesEvent />
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>