Skip to content

Commit 8858ebc

Browse files
marclavalmprobst
authored andcommitted
ci: update SauceLabs badge when running CI on master (angular#11352)
1 parent df4c0a3 commit 8858ebc

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
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

1112
Angular
1213
=========

scripts/ci-lite/env.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff 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

scripts/ci-lite/test_saucelabs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ cd ../..
1717

1818
./scripts/sauce/sauce_connect_block.sh
1919
SAUCE_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

2222
echo 'travis_fold:end:test_saucelabs'

0 commit comments

Comments
 (0)