File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 66[ ![ npm version] ( https://badge.fury.io/js/%40angular%2Fcore.svg )] ( https://badge.fury.io/js/%40angular%2Fcore )
77[ ![ Downloads] ( http://img.shields.io/npm/dm/angular2.svg )] ( https://npmjs.org/package/angular2 )
88
9- [ ![ Sauce Test Status] ( https://saucelabs.com/browser-matrix/angular2-ci.svg )] ( https://saucelabs.com/u/angular2-ci )
9+ [ ![ Sauce Test Status] ( https://saucelabs.com/browser-matrix/angular2-ci.svg )] ( https://saucelabs.com/u/angular2-ci )
10+ * Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [ BrowserStack] [ https://www.browserstack.com/ ] .*
1011
1112Angular
1213=========
Original file line number Diff line number Diff line change @@ -59,8 +59,16 @@ if [[ ${TRAVIS} ]]; then
5959 export CXX=g++-4.8
6060
6161 # Used by karma and karma-chrome-launcher
62- export SAUCE_USERNAME=angular-ci
63- export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
62+ # In order to have a meaningful SauceLabs badge on the repo page,
63+ # the angular2-ci account is used only when pushing commits to master;
64+ # in all other cases, the regular angular-ci account is used.
65+ if [ " ${TRAVIS_PULL_REQUEST} " = " false" ] && [ " ${TRAVIS_BRANCH} " = " master" ]; then
66+ export SAUCE_USERNAME=angular2-ci
67+ export SAUCE_ACCESS_KEY=693ebc16208a-0b5b-1614-8d66-a2662f4e
68+ else
69+ export SAUCE_USERNAME=angular-ci
70+ export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
71+ fi
6472 export BROWSER_STACK_USERNAME=angularteam1
6573 export BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
6674 export CHROME_BIN=${HOME} /.chrome/chromium/chrome-linux/chrome
Original file line number Diff line number Diff line change @@ -17,6 +17,6 @@ cd ../..
1717
1818./scripts/sauce/sauce_connect_block.sh
1919SAUCE_ACCESS_KEY=` echo $SAUCE_ACCESS_KEY | rev`
20- $( npm bin) /karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
20+ $( npm bin) /karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters internal-angular,saucelabs
2121
2222echo ' travis_fold:end:test_saucelabs'
You can’t perform that action at this time.
0 commit comments