diff options
| author | Solly Ross <directxman12+github@gmail.com> | 2017-06-05 14:28:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 14:28:28 -0400 |
| commit | a5c366b834cbeb8e89406e0374e2a0903cedfbe8 (patch) | |
| tree | f085f5e5a6d875eaa2b30b24fb992505138ce486 | |
| parent | 255fbe0c9e93d26b0edc6c33fdd99dd64e7bc976 (diff) | |
| parent | b081ea72669e89ee9080292005778f20f2c7902f (diff) | |
| download | novnc-a5c366b834cbeb8e89406e0374e2a0903cedfbe8.tar.gz | |
Merge pull request #838 from novnc/infra/fix-travis-sauce
Fix Travis-Sauce Connection
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | karma.conf.js | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ba5c50b..d5b4abb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,11 @@ env: - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11' - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10' - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11' - global: - - secure: QE5GqGd2hrpQsIgd8dlv3oRUUHqZayomzzQjNXOB81VQi241uz/ru+3GtBZLB5WLZCq/Gj89vbLnR0LN4ixlmPaWv3/WJQGyDGuRD/vMnccVl+rBUP/Hh2zdYwiISIGcrywNAE+KLus/lyt/ahVgzbaRaDSzrM1HaZFT/rndGck= - - secure: g75sdctEwj0hoLW0Y08Tdv8s5scNzplB6a9EtaJ2vJD9S/bK+AsPqbWesGv1UlrFPCWdbV7Vg61vkmoUjcmb5xhqFIjcM9TlYJoKWeOTsOmnQoSIkIq6gMF1k02+LmKInbPgIzrp3m3jluS1qaOs/EzFpDnJp9hWBiAfXa12Jxk= before_script: npm install -g karma-cli addons: - sauce_connect: true + sauce_connect: + username: + secure: "Y5+WRK1ThvctFQNchjW2jly9eLrxe9k8wkKZhS2OGT3SDAmFZnJADswbk/jEbhtl+ZclXybz0uy8Y5YT1PzVCySOqwvy5viIvMZ1xXlOMt1wwJIYbsb3AbOTt3lS+GBXB7RSk0Um5nVx+IMDDIjfS+kQ53NeR1+a/RrDaVNfDEE=" + jwt: + secure: "MHYV2PhoZtNdeSNgRQjLRSn8T9BmwvwBNTgzwOfrUrwU4kVH16ETWOCnygybuRtYC/LNwQxe5W0hcb4rqOzlOO+fWr7OUdRAg8MPXVK0v3WVRu0BpgDIqMXlAbSp2IyCADjqNxG4pmGyrlfAhJ5yO7moaHpjU4QkkXX6QrvjmH4=" + diff --git a/karma.conf.js b/karma.conf.js index 821007e..1060ee5 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -5,7 +5,8 @@ module.exports = function(config) { var browsers = []; var useSauce = false; - if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) { + // use Sauce when running on Travis + if (process.env.TRAVIS_JOB_NUMBER) { useSauce = true; } |