Skip to content
This repository has been archived by the owner on Aug 24, 2022. It is now read-only.

Commit

Permalink
Maybe this will work? Travis and YAML are undocumented nightmares
Browse files Browse the repository at this point in the history
  • Loading branch information
kg committed Aug 31, 2015
1 parent 946b908 commit 9caf160
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions ci/download-compile-cache.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ci/upload-compile-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
7 changes: 6 additions & 1 deletion jsil.org/ci/App_Code/common.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
}
}

0 comments on commit 9caf160

Please sign in to comment.