From 8f6c45f9e29c9d19b7f86913119c78bb0a340aaa Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Thu, 12 Feb 2015 15:00:43 -0800 Subject: [PATCH] build against both stable and dev channels of Dart --- .travis.yml | 4 +++- scripts/ci/install_dart.sh | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8deedf150e..b54ccc2151 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,13 @@ node_js: - '0.10' env: global: - - CHANNEL=stable - KARMA_BROWSERS=DartiumWithWebPlatform - E2E_BROWSERS=Dartium - LOGS_DIR=/tmp/angular-build/logs - ARCH=linux-x64 + matrix: + - CHANNEL=stable + - CHANNEL=dev before_install: - export DISPLAY=:99.0 diff --git a/scripts/ci/install_dart.sh b/scripts/ci/install_dart.sh index 182050ba2e..f0b17be3ff 100755 --- a/scripts/ci/install_dart.sh +++ b/scripts/ci/install_dart.sh @@ -7,15 +7,7 @@ AVAILABLE_DART_VERSION=$(curl "https://storage.googleapis.com/dart-archive/chann echo Fetch Dart channel: $CHANNEL -SVN_REVISION=latest -# TODO(chirayu): Remove this once issue 20896 is fixed. -# Dart 1.7.0-dev.1.0 and 1.7.0-dev.2.0 are both broken so use version -# 1.7.0-dev.0.1 instead. -if [[ "$AVAILABLE_DART_VERSION" == "1.7.0-dev.2.0" ]]; then - SVN_REVISION=39661 # Use version 1.7.0-dev.0.1 -fi - -URL_PREFIX=https://storage.googleapis.com/dart-archive/channels/$CHANNEL/release/$SVN_REVISION +URL_PREFIX=https://storage.googleapis.com/dart-archive/channels/$CHANNEL/release/latest DART_SDK_URL="$URL_PREFIX/sdk/dartsdk-$ARCH-release.zip" DARTIUM_URL="$URL_PREFIX/dartium/dartium-$ARCH-release.zip"