Skip to content

Commit 43cca2d

Browse files
committed
fix(build): lock dart dev version
Related to #4467
1 parent d21c7bd commit 43cca2d

2 files changed

Lines changed: 18 additions & 13 deletions

File tree

.travis.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ env:
2020
- SAUCE_USERNAME=angular-ci
2121
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
2222
- ARCH=linux-x64
23+
# TODO: change DART_DEV_VERSION to "latest" again once
24+
# https://github.com/angular/angular/issues/4467 is solved
25+
- DART_DEV_VERSION=1.13.0-dev.3.1
26+
- DART_STABLE_VERSION=latest
2327
# Token for tsd to increase github rate limit
2428
# See https://github.com/DefinitelyTyped/tsd#tsdrc
2529
# This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
@@ -31,18 +35,18 @@ env:
3135
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
3236
matrix:
3337
# Order: slowest build on top, so that we don't hog VMs while waiting for others to complete.
34-
- MODE=dart DART_CHANNEL=stable
35-
- MODE=dart DART_CHANNEL=dev
36-
- MODE=saucelabs DART_CHANNEL=dev
37-
- MODE=dart_experimental DART_CHANNEL=dev
38-
- MODE=js DART_CHANNEL=dev
39-
- MODE=router DART_CHANNEL=dev
40-
- MODE=lint DART_CHANNEL=dev
38+
- MODE=dart DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
39+
- MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
40+
- MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
41+
- MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
42+
- MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
43+
- MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
44+
- MODE=lint DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
4145

4246
matrix:
4347
allow_failures:
44-
- env: "MODE=saucelabs DART_CHANNEL=dev"
45-
- env: "MODE=dart_experimental DART_CHANNEL=dev"
48+
- env: "MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
49+
- env: "MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
4650

4751
addons:
4852
firefox: "38.0"
@@ -52,7 +56,7 @@ before_install:
5256
- export DISPLAY=:99.0
5357
- export GIT_SHA=$(git rev-parse HEAD)
5458
- ./scripts/ci/init_android.sh
55-
- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH}
59+
- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
5660
- sh -e /etc/init.d/xvfb start
5761
- if [[ -e SKIP_TRAVIS_TESTS ]]; then { cat SKIP_TRAVIS_TESTS ; exit 0; } fi
5862
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'

scripts/ci/install_dart.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
set -e -x
44

55
DART_CHANNEL=$1
6-
ARCH=$2
6+
VERSION=$2
7+
ARCH=$3
78

8-
AVAILABLE_DART_VERSION=$(curl "https://storage.googleapis.com/dart-archive/channels/${DART_CHANNEL}/release/latest/VERSION" | python -c \
9+
AVAILABLE_DART_VERSION=$(curl "https://storage.googleapis.com/dart-archive/channels/${DART_CHANNEL}/release/${VERSION}/VERSION" | python -c \
910
'import sys, json; print(json.loads(sys.stdin.read())["version"])')
1011

1112
echo Fetch Dart channel: ${DART_CHANNEL}
1213

13-
URL_PREFIX=https://storage.googleapis.com/dart-archive/channels/${DART_CHANNEL}/release/latest
14+
URL_PREFIX=https://storage.googleapis.com/dart-archive/channels/${DART_CHANNEL}/release/${VERSION}
1415
DART_SDK_URL="$URL_PREFIX/sdk/dartsdk-$ARCH-release.zip"
1516
DARTIUM_URL="$URL_PREFIX/dartium/dartium-$ARCH-release.zip"
1617

0 commit comments

Comments
 (0)