cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci(aio): bringing in #14888 (because no patience)

Browse Source
This commit is contained in:
Georgios Kalpakas
2017-03-02 22:54:19 +02:00
committed by Chuck Jazdzewski
parent a3a7cf2090
commit 5ab2e28703
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -14,9 +14,9 @@ addons:
- g++-4.8 - g++-4.8
# https://docs.travis-ci.com/user/jwt # https://docs.travis-ci.com/user/jwt
jwt: jwt:
# NGBUILDS_IO_KEY=<secret in valentine> # SAUCE_ACCESS_KEY<=secret for NGBUILDS_IO_KEY to work around travis-ci/travis-ci#7223, unencrypted value in valentine as NGBUILDS_IO_KEY>
secure: Z+BZX6qzO4QIk1mOt8hNobltUmrO3Fh8CxKY6eiyBZRqlqVjkhwnvcXylt70luAw7uNU1G8eSUUN/n/o0SnuZ/Okayejj/5gsjzNPwUS5Wzdod+UfsLxZNG9vNVxYyH1pRdANQtnNHV0uj+aR0oSUp3ZsFIlbo9gizcM4Qj01Yc= # we alias NGBUILDS_IO_KEY to $SAUCE_ACCESS_KEY in env.sh and set the SAUCE_ACCESS_KEY there
- secure: "L7nrZwkAtFtYrP2DykPXgZvEKjkv0J/TwQ/r2QGxFTaBq4VZn+2Dw0YS7uCxoMqYzDwH0aAOqxoutibVpk8Z/16nE3tNmU5RzltMd6Xmt3qU2f/JDQLMo6PSlBodnjOUsDHJgmtrcbjhqrx/znA237BkNUu6UZRT7mxhXIZpn0U="
branches: branches:
except: except:
- g3_v2_0 - g3_v2_0

11
scripts/ci/env.sh
View File

@ -72,21 +72,28 @@ if [[ ${TRAVIS:-} ]]; then
# more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements # more info: https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
setEnvVar CXX g++-4.8 setEnvVar CXX g++-4.8
# If NGBUILDS_IO_KEY not set yet, export the NGBUILDS_IO_KEY using the JWT token that Travis generated and exported for SAUCE_ACCESS_KEY.
# This is a workaround for travis-ci/travis-ci#7223
export NGBUILDS_IO_KEY=${NGBUILDS_IO_KEY:-$SAUCE_ACCESS_KEY}
# Used by karma and karma-chrome-launcher # Used by karma and karma-chrome-launcher
# In order to have a meaningful SauceLabs badge on the repo page, # In order to have a meaningful SauceLabs badge on the repo page,
# the angular2-ci account is used only when pushing commits to master; # the angular2-ci account is used only when pushing commits to master;
# in all other cases, the regular angular-ci account is used. # in all other cases, the regular angular-ci account is used.
if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
setEnvVar SAUCE_USERNAME angular2-ci setEnvVar SAUCE_USERNAME angular2-ci
# don't print the key # - not using use setEnvVar so that we don't print the key
# - we overwrite the value set by Travis JWT addon here to work around travis-ci/travis-ci#7223 for NGBUILDS_IO_KEY
export SAUCE_ACCESS_KEY=693ebc16208a-0b5b-1614-8d66-a2662f4e export SAUCE_ACCESS_KEY=693ebc16208a-0b5b-1614-8d66-a2662f4e
else else
setEnvVar SAUCE_USERNAME angular-ci setEnvVar SAUCE_USERNAME angular-ci
# don't print the key # - not using use setEnvVar so that we don't print the key
# - we overwrite the value set by Travis JWT addon here to work around travis-ci/travis-ci#7223 for NGBUILDS_IO_KEY
export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 export SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
fi fi
setEnvVar BROWSER_STACK_USERNAME angularteam1 setEnvVar BROWSER_STACK_USERNAME angularteam1
# not using use setEnvVar so that we don't print the key
export BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB export BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
setEnvVar CHROME_BIN ${HOME}/.chrome/chromium/chrome-linux/chrome setEnvVar CHROME_BIN ${HOME}/.chrome/chromium/chrome-linux/chrome
setEnvVar BROWSER_PROVIDER_READY_FILE /tmp/angular-build/browser-provider-tunnel-init.lock setEnvVar BROWSER_PROVIDER_READY_FILE /tmp/angular-build/browser-provider-tunnel-init.lock