Explorar o código

[SauceLabs] Use SAUCE env var to indicate running SauceLabs test.

Andy Li %!s(int64=10) %!d(string=hai) anos
pai
achega
2a75f0b5e1
Modificáronse 2 ficheiros con 7 adicións e 6 borrados
  1. 4 3
      .travis.yml
  2. 3 3
      tests/RunCi.hx

+ 4 - 3
.travis.yml

@@ -6,6 +6,9 @@ env:
     - OCAMLC=ocamlc.opt
     - OCAMLC=ocamlc.opt
     - OCAMLOPT=ocamlopt.opt
     - OCAMLOPT=ocamlopt.opt
     - ADD_REVISION=1
     - ADD_REVISION=1
+    # SauceLabs
+    - secure: SjyKefmjUEXi0IKHGGpcbLAajU0mLHONg8aA8LoY7Q9nAkSN6Aql+fzS38Boq7w1jWn+2FOpr+4jy0l6wVd/bftsF+huFfYpFJmdh8BlKmE0K71zZAral0H1c7YxkuQpPiJCIFGXqtkvev7SWTy0z31u7kuuQeEyW27boXe5cDA=
+    - secure: sUvWUjCyPuWht4seNa4f2VG9DkvXkhZyLZfjJO9TUAHB2JndS16E2j/qrvKEjycyH6w8tU/B9vnjDRvvGrYXxEXcBEwsJVfkorFnRl9uwGCGIYrzjMhssEl3fMYZK7P304f+gAp5ULrDBX2gIaKeSa8lUNRtz2PsZOieE4kMdhk=
     # Bintray
     # Bintray
     - secure: "ETbwZaeRq8wIVZVyUk1IsNctYVuQa/U2biRkF9pQkz3MEXpaneynclVzNjm8rnm8JqfKcjUDUvQJBP1KYrJYq3tAJFhl31YUnS0FsF3sgLIcnHkhbRA24xJdIlCwHP6QUPoiyPbkec43NRwrF0071KOMD51vgUToXRtAe3o/15g="
     - secure: "ETbwZaeRq8wIVZVyUk1IsNctYVuQa/U2biRkF9pQkz3MEXpaneynclVzNjm8rnm8JqfKcjUDUvQJBP1KYrJYq3tAJFhl31YUnS0FsF3sgLIcnHkhbRA24xJdIlCwHP6QUPoiyPbkec43NRwrF0071KOMD51vgUToXRtAe3o/15g="
     - secure: "Fcrrge2f4jFYDOopig2rwkQvgJw6Ra8UK6OwTVk08wecytzVaOJK1TcB22PSvZ+h0ZLJs34T+pXHFjlNuSWm4+CwGSvnltRD1/svjS8zOqK7RzuUdzHz87yruz9PFqV63HTas6qtmgLqp8n/Q6AhtDLF39BTZPyDzEbi9qkwRuI="
     - secure: "Fcrrge2f4jFYDOopig2rwkQvgJw6Ra8UK6OwTVk08wecytzVaOJK1TcB22PSvZ+h0ZLJs34T+pXHFjlNuSWm4+CwGSvnltRD1/svjS8zOqK7RzuUdzHz87yruz9PFqV63HTas6qtmgLqp8n/Q6AhtDLF39BTZPyDzEbi9qkwRuI="
@@ -45,9 +48,7 @@ matrix:
     - os: linux
     - os: linux
       env:
       env:
         - TEST=js
         - TEST=js
-        # SAUCE_USERNAME and SAUCE_ACCESS_KEY
-        - secure: SjyKefmjUEXi0IKHGGpcbLAajU0mLHONg8aA8LoY7Q9nAkSN6Aql+fzS38Boq7w1jWn+2FOpr+4jy0l6wVd/bftsF+huFfYpFJmdh8BlKmE0K71zZAral0H1c7YxkuQpPiJCIFGXqtkvev7SWTy0z31u7kuuQeEyW27boXe5cDA=
-        - secure: sUvWUjCyPuWht4seNa4f2VG9DkvXkhZyLZfjJO9TUAHB2JndS16E2j/qrvKEjycyH6w8tU/B9vnjDRvvGrYXxEXcBEwsJVfkorFnRl9uwGCGIYrzjMhssEl3fMYZK7P304f+gAp5ULrDBX2gIaKeSa8lUNRtz2PsZOieE4kMdhk=
+        - SAUCE=1
       addons: {apt: {packages: *apt_common}, sauce_connect: true}
       addons: {apt: {packages: *apt_common}, sauce_connect: true}
     - os: linux
     - os: linux
       env: TEST=php
       env: TEST=php

+ 3 - 3
tests/RunCi.hx

@@ -748,9 +748,9 @@ class RunCi {
 
 
 					var env = Sys.environment();
 					var env = Sys.environment();
 					if (
 					if (
-						env.exists("SAUCE_USERNAME") && env.exists("SAUCE_ACCESS_KEY") &&
-						// only run on Linux build
-						(ci != null ? systemName == "Linux" : true)
+						env.exists("SAUCE") && 
+						env.exists("SAUCE_USERNAME") && 
+						env.exists("SAUCE_ACCESS_KEY")
 					) {
 					) {
 						// sauce-connect should have been started
 						// sauce-connect should have been started