Skip to content

Commit

Permalink
ci: use chrome stable (angular#18307)
Browse files Browse the repository at this point in the history
  • Loading branch information
filipesilva authored and mhevery committed Jul 25, 2017
1 parent 6fc5940 commit 8bcb268
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 100 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
language: node_js
sudo: false
# force precise to avoid a timeout in karma
dist: precise
# force trusty as Google Chrome addon is not supported on Precise
dist: trusty
node_js:
- '6.9.5'

addons:
chrome: stable
# firefox: "38.0"
apt:
sources:
Expand Down
5 changes: 0 additions & 5 deletions aio/scripts/test-pwa-score.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ const config = require('lighthouse/lighthouse-core/config/default.js');
// Constants
const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer/';

// Specify the path to Chrome on Travis
if (process.env.TRAVIS) {
process.env.LIGHTHOUSE_CHROMIUM_PATH = process.env.CHROME_BIN;
}

// Run
_main(process.argv.slice(2));

Expand Down
6 changes: 1 addition & 5 deletions aio/tools/examples/shared/protractor.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ exports.config = {

// Capabilities to be passed to the webdriver instance.
capabilities: {
'browserName': 'chrome',
// For Travis
chromeOptions: {
binary: process.env.CHROME_BIN
}
'browserName': 'chrome'
},

// Framework to use. Jasmine is recommended.
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ fi
setEnvVar NODE_VERSION 6.9.5
setEnvVar NPM_VERSION 3.10.7 # do not upgrade to >3.10.8 unless https://github.com/npm/npm/issues/14042 is resolved
setEnvVar YARN_VERSION 0.24.6
setEnvVar CHROMIUM_VERSION 464641 # Chrome 59 linux stable, see https://www.chromium.org/developers/calendar
setEnvVar SAUCE_CONNECT_VERSION 4.3.11
setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)

Expand Down Expand Up @@ -103,7 +102,6 @@ if [[ ${TRAVIS:-} ]]; then
setEnvVar BROWSER_STACK_USERNAME angularteam1
# not using use setEnvVar so that we don't print the key
export BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
setEnvVar CHROME_BIN ${HOME}/.chrome/chromium/chrome-linux/chrome
setEnvVar BROWSER_PROVIDER_READY_FILE /tmp/angular-build/browser-provider-tunnel-init.lock
fi

Expand Down
84 changes: 0 additions & 84 deletions scripts/ci/install-chromium.sh

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ fi
if [[ ${CI_MODE} == "js" || ${CI_MODE} == "e2e" || ${CI_MODE} == "e2e_2" || ${CI_MODE} == "aio" || ${CI_MODE} == "aio_e2e" ]]; then
travisFoldStart "install-chromium"
(
${thisDir}/install-chromium.sh

# Start xvfb for local Chrome used for testing
if [[ ${TRAVIS} ]]; then
travisFoldStart "install-chromium.xvfb-start"
Expand Down

0 comments on commit 8bcb268

Please sign in to comment.