From 9caf16064f21216e6b98171a2127d9d45f8a0f75 Mon Sep 17 00:00:00 2001
From: Katelyn Gadd <kg@luminance.org>
Date: Mon, 31 Aug 2015 00:06:18 -0700
Subject: [PATCH] Maybe this will work? Travis and YAML are undocumented
 nightmares

---
 .travis.yml                    | 3 +++
 ci/download-compile-cache.sh   | 5 +++--
 ci/upload-compile-cache.sh     | 2 +-
 jsil.org/ci/App_Code/common.cs | 7 ++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2cb05a2ee..842ae29a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,5 +23,8 @@ env:
     - NODEJS_VERSION=0.10
   matrix:
     - TestRun=JSIL.Tests.DeadCodeEliminationTest,JSIL.Tests.APITests,JSIL.Tests.AnalysisTests,JSIL.Tests.ComparisonTests,JSIL.Tests.ConfigurationTests,JSIL.Tests.DependencyTests,JSIL.Tests.FailingTests,JSIL.Tests.FormattingTests,JSIL.Tests.GenericsTests,JSIL.Tests.MetadataTests,JSIL.Tests.PerformanceTests,JSIL.Tests.TypeInformationTests,JSIL.Tests.UnsafeTests,JSIL.Tests.VerbatimTests,JSIL.Tests.XMLTests,JSIL.Tests.ThreadingTests
+      JSIL_STORAGE_TAG=misc-tests
     - TestRun=JSIL.SimpleTests.SimpleTests,JSIL.SimpleTests.SimpleTestCasesForStubbedBcl
+      JSIL_STORAGE_TAG=stubbed-tests
     - TestRun=JSIL.SimpleTests.SimpleTestCasesForTranslatedBcl
+      JSIL_STORAGE_TAG=translated-tests
\ No newline at end of file
diff --git a/ci/download-compile-cache.sh b/ci/download-compile-cache.sh
index 3ba892857..e0675c9d1 100755
--- a/ci/download-compile-cache.sh
+++ b/ci/download-compile-cache.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-if curl "jsil.org/ci/download.aspx?key=travisci-compilecache&password=$JSIL_STORAGE_PASSWORD" -o "/tmp/compilecache.zip"; then
+if curl -S "jsil.org/ci/download.aspx?key=travisci&tag=$JSIL_STORAGE_TAG&password=$JSIL_STORAGE_PASSWORD" -o "/tmp/compilecache.zip"; then
     echo "Failed to download compile cache."
 else
-    echo "Downloaded and unpacked compile cache."
+    echo "Downloaded compile cache."
     unzip -o "/tmp/compilecache.zip" -d /tmp/JSIL Tests/
+    echo "Unpacked compile cache."
 fi
\ No newline at end of file
diff --git a/ci/upload-compile-cache.sh b/ci/upload-compile-cache.sh
index aafd71ba3..e0501b5e9 100755
--- a/ci/upload-compile-cache.sh
+++ b/ci/upload-compile-cache.sh
@@ -2,7 +2,7 @@
 
 zip -3 -r "/tmp/compilecache.zip" "/tmp/JSIL Tests/*"
 
-if curl -X POST "jsil.org/ci/upload.aspx?key=travisci-compilecache&password=$JSIL_STORAGE_PASSWORD" --data-binary "@/tmp/compilecache.zip"; then
+if curl -S -X POST "jsil.org/ci/upload.aspx?key=travisci&tag=$JSIL_STORAGE_TAG&password=$JSIL_STORAGE_PASSWORD" --data-binary "@/tmp/compilecache.zip"; then
     echo "Failed to upload compile cache."
 else
     echo "Uploaded compile cache."
diff --git a/jsil.org/ci/App_Code/common.cs b/jsil.org/ci/App_Code/common.cs
index 746241f3b..cf67bc0d1 100644
--- a/jsil.org/ci/App_Code/common.cs
+++ b/jsil.org/ci/App_Code/common.cs
@@ -39,6 +39,8 @@ protected bool SetupRequest (out string targetPath) {
             return false;
         }
 
+        var tag = Request.Params["tag"] ?? "";
+
         var targetDir = Path.Combine(
             Path.GetTempPath(),
             "JSIL CI"
@@ -47,7 +49,10 @@ protected bool SetupRequest (out string targetPath) {
         if (!Directory.Exists(targetDir))
             Directory.CreateDirectory(targetDir);
 
-        targetPath = Path.Combine(targetDir, key + ".bin");
+        targetPath = Path.Combine(
+            targetDir, 
+            string.Format("{0}-{1}.bin", key, tag)
+        );
         return true;
     }
 }
\ No newline at end of file