Skip to content

Commit

Permalink
ci: update SauceLabs badge when running CI on master (angular#11352)
Browse files Browse the repository at this point in the history
  • Loading branch information
marclaval authored and mprobst committed Sep 6, 2016
1 parent df4c0a3 commit 8858ebc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
[![Downloads](http://img.shields.io/npm/dm/angular2.svg)](https://npmjs.org/package/angular2)

[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
*Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [BrowserStack][https://www.browserstack.com/].*

Angular
=========
Expand Down
12 changes: 10 additions & 2 deletions scripts/ci-lite/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,16 @@ if [[ ${TRAVIS} ]]; then
export CXX=g++-4.8

# Used by karma and karma-chrome-launcher
export SAUCE_USERNAME=angular-ci
export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
# In order to have a meaningful SauceLabs badge on the repo page,
# the angular2-ci account is used only when pushing commits to master;
# in all other cases, the regular angular-ci account is used.
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
export SAUCE_USERNAME=angular2-ci
export SAUCE_ACCESS_KEY=693ebc16208a-0b5b-1614-8d66-a2662f4e
else
export SAUCE_USERNAME=angular-ci
export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
fi
export BROWSER_STACK_USERNAME=angularteam1
export BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
export CHROME_BIN=${HOME}/.chrome/chromium/chrome-linux/chrome
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-lite/test_saucelabs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ cd ../..

./scripts/sauce/sauce_connect_block.sh
SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
$(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
$(npm bin)/karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS} --reporters internal-angular,saucelabs

echo 'travis_fold:end:test_saucelabs'

0 comments on commit 8858ebc

Please sign in to comment.