Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit bf4f6cd

Browse files
chore(travis): more updates to scripts.
* update travis-run-script * add default browsers (Chrome, Firefox) unless overridden by env variables * enable travis error tracing * updates to source-browsers.json * set SL_FIREFOX to latest version * update SL_IE11 to version 11.103 * add BS_Safari10 entry * update travis.yml * add ng-version 1.5 and saucelabs_required
1 parent 8c8b931 commit bf4f6cd

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ env:
1515
- secure: X7CNmOMemAJ9Jqrsmv6MXyeh8n8TIL5CKzE9LYsZUbsyKo0l5CyyysJq0y/AbpQS6awsSv2qP/cZ/kand6r6z0wMFbUcxa4HjMZEfRwv3sGtwj1OKJko/GvjcZQzD54FtHy1NU7wR0mYhAlE5IwH7f8bMa/nUiijgD/TOCTtKH8=
1616
matrix:
1717
- NG_VERSION=1.5
18+
- NG_VERSION=1.6
1819
- NG_VERSION=snapshot
20+
- MODE=saucelabs_required
1921

2022
matrix:
2123
fast_finish: true

config/sauce-browsers.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
"SL_FIREFOX": {
1919
"base": "SauceLabs",
2020
"browserName": "firefox",
21-
"platform": "Windows 10",
22-
"version": "latest-1"
21+
"version": "latest"
2322
},
2423
"SL_FIREFOXBETA": {
2524
"base": "SauceLabs",
@@ -83,7 +82,7 @@
8382
"base": "SauceLabs",
8483
"browserName": "internet explorer",
8584
"platform": "Windows 10",
86-
"version": "11"
85+
"version": "11.103"
8786
},
8887
"SL_EDGE": {
8988
"base": "SauceLabs",
@@ -151,6 +150,12 @@
151150
"os": "OS X",
152151
"os_version": "El Capitan"
153152
},
153+
"BS_SAFARI10": {
154+
"base": "BrowserStack",
155+
"browser": "safari",
156+
"os": "OS X",
157+
"os_version": "Sierra"
158+
},
154159
"BS_IOS7": {
155160
"base": "BrowserStack",
156161
"device": "iPhone 5S",

scripts/travis-run-script.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
#!/bin/bash
22

3-
# Terminate the execution if anything fails in the pipeline.
4-
set -e
3+
# Enable tracing and Terminate the execution if anything fails in the pipeline.
4+
set -xe
55

66
# Ensure that scripts will run from project dir.
77
cd $(dirname $0)/..
88

9+
# This is the default set of browsers to use on the CI server unless overridden via env variable
10+
if [[ -z "$BROWSERS" ]]
11+
then
12+
BROWSERS="Chrome,Firefox"
13+
fi
14+
915
# When Travis CI specifies an Angular version, try to install those for tests.
1016
if [[ -n "$NG_VERSION" ]]; then
1117
./scripts/fetch-angular-version.sh "$NG_VERSION"
@@ -24,4 +30,4 @@ gulp build
2430
gulp karma --config=config/karma-sauce.conf.js --browsers=$BROWSER --reporters='dots'
2531

2632
# Shutdown the tunnel
27-
./scripts/sauce/stop-tunnel.sh
33+
./scripts/sauce/stop-tunnel.sh

0 commit comments

Comments
 (0)