From 295a5ee34907bb559cda32437095c0c5ae26f1c8 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Mon, 11 Apr 2016 16:35:05 -0700 Subject: [PATCH 1/2] Properly set commits file location after caching Coherence. --- makefile.shade | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/makefile.shade b/makefile.shade index fb0f880c14..be3dcbc9a6 100644 --- a/makefile.shade +++ b/makefile.shade @@ -341,7 +341,14 @@ var buildTarget = "compile" Environment.SetEnvironmentVariable("NUGET_VOLATILE_FEED_ASPNETVNEXT", coherenceCacheDir); Environment.SetEnvironmentVariable("NUGET_VOLATILE_FEED_EXTERNAL", Path.Combine(dropsShare, "latest-packages", "external", buildBranch)); - Environment.SetEnvironmentVariable("UNIVERSE_COMMITS_FILE", universeCommitsFileTarget); + + // Only update commits file location if it hadn't been previously set + if (string.IsNullOrWhiteSpace(universeCommitsFile)) + { + universeCommitsFile = universeCommitsFileTarget; + Log.Info("Updating UNIVERSE_COMMITS_FILE to " + universeCommitsFileTarget); + Environment.SetEnvironmentVariable("UNIVERSE_COMMITS_FILE", universeCommitsFileTarget); + } } } From 2235b79a8df19888ef4547bb509bd526a573235b Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Mon, 11 Apr 2016 16:35:45 -0700 Subject: [PATCH 2/2] Only reset repos that were cloned. --- makefile.shade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile.shade b/makefile.shade index be3dcbc9a6..ac010f7868 100644 --- a/makefile.shade +++ b/makefile.shade @@ -100,7 +100,7 @@ var buildTarget = "compile" Parallel.ForEach(repositories, repo => { - if (commitsToSync.ContainsKey(repo)) + if (commitsToSync.ContainsKey(repo) && Directory.Exists(repo)) { var syncHash = commitsToSync[repo]; Console.WriteLine(string.Format("Syncing {0} to {1}", repo, syncHash));