Skip to content

Commit 6df87ae

Browse files
committed
chore(travis): install dart before "npm install"
This simplifies a later commit which will allow us to bail out earlier.
1 parent 3fdd891 commit 6df87ae

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

scripts/travis/install.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,31 @@ if [[ $BROWSERS =~ "dartium" ]]; then
1616
rm dartium.zip
1717
mv dartium-* chromium
1818
fi
19+
20+
echo Fetch Dart channel: $CHANNEL
21+
22+
DART_SDK_ZIP=dartsdk-linux-x64-release.zip
23+
24+
# TODO(chirayu): Remove this once issue 1350 is fixed.
25+
SVN_REVISION=latest
26+
if [[ "$CHANNEL" == "dev" ]]; then
27+
issue_1350_state=$(curl 'https://api.github.com/repos/angular/angular.dart/issues/1020' | python -c \
28+
'import sys, json; print(json.loads(sys.stdin.read())["state"])')
29+
if [[ "$issue_1350_state" == "open" ]]; then
30+
# Is there a newer dev SDK?
31+
latest_version=$(curl 'https://storage.googleapis.com/dart-archive/channels/dev/release/latest/VERSION' | python -c \
32+
'import sys, json; print(json.loads(sys.stdin.read())["version"])')
33+
if [[ "$latest_version" == "1.6.0-dev.8.0" ]]; then
34+
# Use prior working version (1.6.0-dev.7.0)
35+
SVN_REVISION=38831
36+
fi
37+
fi
38+
fi
39+
40+
URL=https://storage.googleapis.com/dart-archive/channels/$CHANNEL/release/$SVN_REVISION/sdk/$DART_SDK_ZIP
41+
echo $URL
42+
curl -L -O $URL
43+
44+
echo Fetched new dart version $(unzip -p $DART_SDK_ZIP dart-sdk/version)
45+
rm -rf dart-sdk
46+
unzip $DART_SDK_ZIP > /dev/null

scripts/travis/setup.sh

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,6 @@
22

33
set -e -o pipefail
44

5-
6-
echo Fetch Dart channel: $CHANNEL
7-
8-
DART_SDK_ZIP=dartsdk-linux-x64-release.zip
9-
10-
# TODO(chirayu): Remove this once issue 1350 is fixed.
11-
SVN_REVISION=latest
12-
if [[ "$CHANNEL" == "dev" ]]; then
13-
issue_1350_state=$(curl 'https://api.github.com/repos/angular/angular.dart/issues/1020' | python -c \
14-
'import sys, json; print(json.loads(sys.stdin.read())["state"])')
15-
if [[ "$issue_1350_state" == "open" ]]; then
16-
# Is there a newer dev SDK?
17-
latest_version=$(curl 'https://storage.googleapis.com/dart-archive/channels/dev/release/latest/VERSION' | python -c \
18-
'import sys, json; print(json.loads(sys.stdin.read())["version"])')
19-
if [[ "$latest_version" == "1.6.0-dev.8.0" ]]; then
20-
# Use prior working version (1.6.0-dev.7.0)
21-
SVN_REVISION=38831
22-
fi
23-
fi
24-
fi
25-
26-
URL=https://storage.googleapis.com/dart-archive/channels/$CHANNEL/release/$SVN_REVISION/sdk/$DART_SDK_ZIP
27-
echo $URL
28-
curl -L -O $URL
29-
30-
echo Fetched new dart version $(unzip -p $DART_SDK_ZIP dart-sdk/version)
31-
rm -rf dart-sdk
32-
unzip $DART_SDK_ZIP > /dev/null
33-
345
if [ "$USE_G3" = "YES" ]; then
356
echo =============================================================================
367
echo "Rebasing onto g3v1x branch"

0 commit comments

Comments
 (0)