Merge pull request #149 from KSP-CKAN/travis_releases

Travis releases
KSP-CKAN · Oct 24, 2014 · 8628ed8 · 8628ed8
2 parents 6d92cde + 4dced9e
commit 8628ed8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ install:
 script:
     - cd CKAN
     - xbuild CKAN.sln
-    - nunit-console Tests/bin/Debug/Tests.dll
+    - nunit-console --exclude=FlakyNetwork Tests/bin/Debug/Tests.dll
 
 before_deploy:
     - cd ..
@@ -16,29 +16,30 @@ before_deploy:
     - cp ckan.exe uploads/ckan-`git describe --long`.exe
 
 deploy:
-    # Any merge to master gets sent to
-    # http://ckan-travis.s3-website-us-east-1.amazonaws.com/
-    - provider: s3
-      access_key_id: AKIAI5JWAEFPFK6GH3XA
-      secret_access_key:
-        secure: b0PPlD7auqysK2LHA8N1US03dE/VKH2rOTwIqpIh50l/gURuXEl7Nd8S7qlf2dpEmz+8D5pIWD+J9scfrdD8Uuakhi3sQbqcV26UiR6+Ye06eGQfmIzqzAECt2naqEy7VJ/xrqq5aaaf8QhcOQMba3qVvwDSzkB2fJeh7+D6EY8=
-      bucket: ckan-travis
-      local-dir: uploads
-      acl: public_read
-      skip_cleanup: true
-      on:
-        repo: KSP-CKAN/CKAN
-        all_branches: true
-
-    # Github releases automatically get a build uploaded!
-    # Dang travis is awesome.
-    - provider: releases
-      api_key:
-        secure: X35XDRJwtFa3+55o9mV2JKVkX5w6W1VMy7bw7E8NaTTHzz+UqY8zEcArrAYWHJcJuslSe9/Ttffm7CgW2crCxkytevKmYCrJyxeb56UQuaADbDmvzT/ib2Vrk48VLDEWZZSyuuQQeT8oqy1RAG8cQLiEgO6QQUEShQ5Duv6Pd7w=
-      file: ckan.exe
-      skip_cleanup: true
-      on:
+    provider: releases
+    api_key:
+        secure: AjwbRLStNJZb9hAOLfRLK85KlFo2q2Dr1NKCoDS4elek1nqSiOjL1hH0kDgUMx/PJqQVnFU8tbJPL30t9Pj7jcJhp0LhbbPipQE3TCSpafTneSEbdz5HT+OdghWCZhUhfs07wGNTFUwcAO4WBZ7wv1AnfdfogHdA5RMdykiIl38=
+    file: ckan.exe
+    on:
         repo: KSP-CKAN/CKAN
         tags: true
         # all_branches needed as a workaround for travis-ci#1675
         all_branches: true
+
+    # Any merge to master gets sent to
+    # http://ckan-travis.s3-website-us-east-1.amazonaws.com/
+    # 
+    # At least, they used to... Travis seems grumpy if we have
+    # more than one deploy stanza, and we want releases more.
+    #
+    # - provider: s3
+    #   access_key_id: AKIAI5JWAEFPFK6GH3XA
+    #   secret_access_key:
+    #     secure: b0PPlD7auqysK2LHA8N1US03dE/VKH2rOTwIqpIh50l/gURuXEl7Nd8S7qlf2dpEmz+8D5pIWD+J9scfrdD8Uuakhi3sQbqcV26UiR6+Ye06eGQfmIzqzAECt2naqEy7VJ/xrqq5aaaf8QhcOQMba3qVvwDSzkB2fJeh7+D6EY8=
+    #   bucket: ckan-travis
+    #  local-dir: uploads
+    #   acl: public_read
+    #  skip_cleanup: true
+    #  on:
+    #    repo: KSP-CKAN/CKAN
+    #    all_branches: true
diff --git a/CKAN/Tests/KerbalStuff/GitHubTests.cs b/CKAN/Tests/KerbalStuff/GitHubTests.cs
@@ -7,7 +7,13 @@ namespace NetKAN.GitHubTests
     [TestFixture()]
     public class GithubAPITests
     {
+
+        // Ironically, despite the fact that these run on travis-ci, which is strongly integrated
+        // to github, these sometimes cause test failures because github will throw random
+        // 403s. (Hence we disable them in travis with --exclude=FlakyNetwork)
+
         [Test()]
+        [Category("FlakyNetwork")]
         public void Release ()
         {
             GithubRelease ckan = CKAN.KerbalStuff.GithubAPI.GetLatestRelease("KSP-CKAN/Test");
@@ -18,6 +24,7 @@ public void Release ()
         }
 
         [Test()]
+        [Category("FlakyNetwork")]
         public void TestGithubRelease()
         {
             Assert.AreEqual(GithubRelease.GithubPage("KSP-CKAN/CKAN"), "https://github.com/KSP-CKAN/CKAN");