iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(build): reenable optional jobs in SL and BS

Browse Source 
Closes #8558
This commit is contained in:
Marc Laval
2016-05-09 16:47:26 -07:00
parent d414734aac
commit d537a26297
8 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ci-lite/cleanup.sh
+6
View File
@@ -21,6 +21,12 @@ if [[ ${TRAVIS} ]]; then
browserstack_required)
./scripts/browserstack/teardown_tunnel.sh
;;
saucelabs_optional)
./scripts/sauce/sauce_connect_teardown.sh
;;
browserstack_optional)
./scripts/browserstack/teardown_tunnel.sh
;;
esac
fi
scripts/ci-lite/env.sh
+6
View File
@@ -30,6 +30,12 @@ if [[ ${TRAVIS} ]]; then
browserstack_required)
KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').browserstackAliases.CI_REQUIRED.join(','))"`
;;
saucelabs_optional)
KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').sauceAliases.CI_OPTIONAL.join(','))"`
;;
browserstack_optional)
KARMA_JS_BROWSERS=`node -e "console.log(require('/home/travis/build/angular/angular/browser-providers.conf').browserstackAliases.CI_OPTIONAL.join(','))"`
;;
esac
else
KARMA_JS_BROWSERS=Chrome
scripts/ci-lite/install.sh
+2 -2
View File
@@ -46,7 +46,7 @@ echo 'travis_fold:end:install-chromium'
# Install Sauce Connect
echo 'travis_fold:start:install.sauceConnect'
if [[ ${TRAVIS} && ${CI_MODE} == "saucelabs_required" ]]; then
if [[ ${TRAVIS}] && (${CI_MODE} == "saucelabs_required" || ${CI_MODE} == "saucelabs_optional") ]]; then
./scripts/sauce/sauce_connect_setup.sh
fi
echo 'travis_fold:end:install.sauceConnect'
@@ -54,7 +54,7 @@ echo 'travis_fold:end:install.sauceConnect'
# Install BrowserStack Tunnel
echo 'travis_fold:start:install.browserstack'
if [[ ${TRAVIS} && ${CI_MODE} == "browserstack_required" ]]; then
if [[ ${TRAVIS} && (${CI_MODE} == "browserstack_required" || ${CI_MODE} == "browserstack_optional") ]]; then
./scripts/browserstack/start_tunnel.sh
fi
echo 'travis_fold:end:install.browserstack'
scripts/ci-lite/test_browserstack.sh
+1 -1
View File
@@ -2,7 +2,7 @@
set -ex -o pipefail
if [[ ${TRAVIS} && ${CI_MODE} != "browserstack_required" ]]; then
if [[ ${TRAVIS} && ${CI_MODE} != "browserstack_required" && ${CI_MODE} != "browserstack_optional" ]]; then
exit 0;
fi
scripts/ci-lite/test_saucelabs.sh
+1 -1
View File
@@ -2,7 +2,7 @@
set -ex -o pipefail
if [[ ${TRAVIS} && ${CI_MODE} != "saucelabs_required" ]]; then
if [[ ${TRAVIS} && ${CI_MODE} != "saucelabs_required" && ${CI_MODE} != "saucelabs_optional" ]]; then
exit 0;
fi