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

Commit 9caf160

Browse files
committed
Maybe this will work? Travis and YAML are undocumented nightmares
1 parent 946b908 commit 9caf160

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ env:
2323
- NODEJS_VERSION=0.10
2424
matrix:
2525
- 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
26+
JSIL_STORAGE_TAG=misc-tests
2627
- TestRun=JSIL.SimpleTests.SimpleTests,JSIL.SimpleTests.SimpleTestCasesForStubbedBcl
28+
JSIL_STORAGE_TAG=stubbed-tests
2729
- TestRun=JSIL.SimpleTests.SimpleTestCasesForTranslatedBcl
30+
JSIL_STORAGE_TAG=translated-tests

ci/download-compile-cache.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/bin/bash
22

3-
if curl "jsil.org/ci/download.aspx?key=travisci-compilecache&password=$JSIL_STORAGE_PASSWORD" -o "/tmp/compilecache.zip"; then
3+
if curl -S "jsil.org/ci/download.aspx?key=travisci&tag=$JSIL_STORAGE_TAG&password=$JSIL_STORAGE_PASSWORD" -o "/tmp/compilecache.zip"; then
44
echo "Failed to download compile cache."
55
else
6-
echo "Downloaded and unpacked compile cache."
6+
echo "Downloaded compile cache."
77
unzip -o "/tmp/compilecache.zip" -d /tmp/JSIL Tests/
8+
echo "Unpacked compile cache."
89
fi

ci/upload-compile-cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
zip -3 -r "/tmp/compilecache.zip" "/tmp/JSIL Tests/*"
44

5-
if curl -X POST "jsil.org/ci/upload.aspx?key=travisci-compilecache&password=$JSIL_STORAGE_PASSWORD" --data-binary "@/tmp/compilecache.zip"; then
5+
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
66
echo "Failed to upload compile cache."
77
else
88
echo "Uploaded compile cache."

jsil.org/ci/App_Code/common.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ protected bool SetupRequest (out string targetPath) {
3939
return false;
4040
}
4141

42+
var tag = Request.Params["tag"] ?? "";
43+
4244
var targetDir = Path.Combine(
4345
Path.GetTempPath(),
4446
"JSIL CI"
@@ -47,7 +49,10 @@ protected bool SetupRequest (out string targetPath) {
4749
if (!Directory.Exists(targetDir))
4850
Directory.CreateDirectory(targetDir);
4951

50-
targetPath = Path.Combine(targetDir, key + ".bin");
52+
targetPath = Path.Combine(
53+
targetDir,
54+
string.Format("{0}-{1}.bin", key, tag)
55+
);
5156
return true;
5257
}
5358
}

0 commit comments

Comments
 (0)