Travis / chrome fixes

- Use google-chrome-stable by default
- Use google-chrome-unstable as Canary (instead of trying to determine last-known-good-revision - we has issues with that yesterday)
- Test chrome stable and unstable separately on travis

Try bot:
https://travis-ci.org/dart-lang/sdk/builds/165541943

R=kevmoo@google.com

Review URL: https://codereview.chromium.org/2396433007 .
This commit is contained in:
Vijay Menon 2016-10-06 08:33:06 -07:00
parent 38e8f0cc8c
commit 8846988b1d
3 changed files with 14 additions and 8 deletions

View file

@ -30,6 +30,15 @@ before_install:
- if [ "$CXX" ]; then $CXX --version ; fi
# Chrome install
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- wget https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb
- sudo dpkg -i google-chrome*.deb
- /usr/bin/google-chrome --version
- export CHROME_BIN=/usr/bin/google-chrome
- /usr/bin/google-chrome-unstable --version
- export CHROME_CANARY_BIN=/usr/bin/google-chrome-unstable
# Install Depot Tools
- git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
- export PATH=`pwd`/depot_tools:"$PATH"
@ -48,7 +57,6 @@ before_install:
# DDC setup
- cd pkg/dev_compiler
- pub global activate dart_coveralls
- export CHROME_CANARY_BIN=`./tool/get_chrome_canary.sh`
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
@ -65,10 +73,10 @@ script:
env:
- ANALYZER=master
- ANALYZER=master DDC_BROWSERS=Firefox
- ANALYZER=master DDC_BROWSERS=ChromeCanaryTravis
- ANALYZER=master CXX=g++
- ANALYZER=master CXX=clang++
- TEST=coverage
- TEST=node
matrix:
allow_failures:
- env: TEST=node

View file

@ -62,12 +62,12 @@ module.exports = function(config) {
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
customLaunchers: {
chrome_travis: {
ChromeTravis: {
base: 'Chrome',
flags: [ '--no-sandbox' ]
},
chrome_canary_travis: {
ChromeCanaryTravis: {
base: 'ChromeCanary',
flags: [ '--no-sandbox' ]
},
@ -81,7 +81,7 @@ module.exports = function(config) {
};
if (process.env.TRAVIS) {
configuration.browsers = ['chrome_canary_travis'];
configuration.browsers = ['ChromeTravis'];
configuration.autoWatch = false;
// Enable this for more logging on Travis. It is too much for Travis to
// automatically display, but still results in a downloadable raw log.

View file

@ -35,9 +35,7 @@ fi
readonly CHROME_CANARY_DIR=$HOME/.chrome/canary
readonly CHROME_CANARY_BIN=$CHROME_CANARY_DIR/$CHROME_NAME/$CHROME_RELATIVE_BIN
readonly CHROME_CANARY_REV_FILE=$CHROME_CANARY_DIR/VERSION
# FIXME(vsm): The latest chromium segfaults on travis and my local linux box.
# readonly CHROME_REV=$(curl -s ${CHROME_URL}/LAST_CHANGE)
readonly CHROME_REV=423167
readonly CHROME_REV=$(curl -s ${CHROME_URL}/LAST_CHANGE)
function getCanary() {
local existing_version=""