Merge branch 'hotfix/0.6.2'

* hotfix/0.6.2: (maint) Fix string formatting (#45) Make it clear when are error has happened
chocolatey · May 3, 2022 · 0f63b7b · 0f63b7b
2 parents a964e17 + c6e5d63
commit 0f63b7b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Chocolatey.Cake.Recipe/Content/gitversion.cake b/Chocolatey.Cake.Recipe/Content/gitversion.cake
@@ -125,7 +125,7 @@ public class BuildVersion
                                 prerelease,
                                 prerelease == "alpha" || prerelease == "beta" ? buildDate : string.Empty,
                                 BuildParameters.BuildCounter != "-1" ? string.Format("-{0}", BuildParameters.BuildCounter) : string.Empty);
-            informationalVersion = string.Format("{0}-{1}-{2}-{3}", majorMinorPatch, prerelease, buildDate, sha);
+            informationalVersion = string.Format("{0}-{1}{2}-{3}", majorMinorPatch, prerelease, buildDate, sha);
             context.Information("There is no tag.");
         }
         else

diff --git a/Chocolatey.Cake.Recipe/Content/localbuild.cake b/Chocolatey.Cake.Recipe/Content/localbuild.cake
@@ -77,6 +77,9 @@ public class LocalBuildRepositoryInfo : IRepositoryInfo
             }
             else
             {
+                context.Information("What version of git are we using...");
+                context.StartProcess("git", new ProcessSettings { Arguments = "--version" });
+
                 context.Information("Getting current branch name...");
                 IEnumerable<string> redirectedStandardOutput;
                 IEnumerable<string> redirectedError;
@@ -101,6 +104,25 @@ public class LocalBuildRepositoryInfo : IRepositoryInfo
                         context.Information("Branch name is {0}", Branch);
                     }
                 }
+                else
+                {
+                    context.Error("Unable to find branch name!");
+                    context.Information("Writing out standard out...");
+                    var standardOutLines = redirectedStandardOutput.ToList();
+                    foreach (var standardOutLine in standardOutLines)
+                    {
+                        context.Information(standardOutLine);
+                    }
+
+                    context.Information("Writing out standard error...");
+                    var standardErrorLines = redirectedError.ToList();
+                    foreach (var standardErrorLine in standardErrorLines)
+                    {
+                        context.Information(standardErrorLine);
+                    }
+
+                    Branch = "unknown";
+                }
 
                 Name = "Local";
                 Tag = new LocalBuildTagInfo(context);