chore: build cjs code prior to launching e2e tests

Closes #6783

Closes #7725
This commit is contained in:
Yegor Jbanov 2016-02-16 20:42:48 -08:00 committed by Miško Hevery
parent 0730b753f2
commit 3739588e97
2 changed files with 24 additions and 3 deletions

View File

@ -26,6 +26,7 @@ git clone https://github.com/dart-lang/dev_compiler.git tmp/dev_compiler
$PUB get) $PUB get)
# Convert TypeScript to Dart # Convert TypeScript to Dart
./node_modules/.bin/gulp build.js.cjs
./node_modules/.bin/gulp build/packages.dart ./node_modules/.bin/gulp build/packages.dart
./node_modules/.bin/gulp build/pubspec.dart ./node_modules/.bin/gulp build/pubspec.dart
node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \ node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \
@ -147,6 +148,9 @@ function killServer () {
./node_modules/.bin/gulp serve.js.ddc& ./node_modules/.bin/gulp serve.js.ddc&
serverPid=$! serverPid=$!
echo CHROM_BIN=$CHROME_BIN
echo CHROM_BIN_VERSION=`$CHROME_BIN --version`
trap killServer EXIT trap killServer EXIT
# wait for server to come up # wait for server to come up
@ -155,7 +159,7 @@ sleep 10
function runSpec { function runSpec {
SPEC=$1 SPEC=$1
./node_modules/.bin/protractor protractor-ddc.conf.js \ ./node_modules/.bin/protractor protractor-ddc.conf.js \
--browsers=${E2E_BROWSERS:-Dartium} \ --browsers=${E2E_BROWSERS:-ChromeDesktop} \
--spec=$SPEC --spec=$SPEC
} }

View File

@ -9,7 +9,24 @@ set -e -x
#Build version read from the OmahaProxy CSV Viewer at https://www.chromium.org/developers/calendar #Build version read from the OmahaProxy CSV Viewer at https://www.chromium.org/developers/calendar
#Let's use the following version of Chromium, and inform about availability of newer build from https://omahaproxy.appspot.com/all #Let's use the following version of Chromium, and inform about availability of newer build from https://omahaproxy.appspot.com/all
CHROMIUM_VERSION=359700 CHROMIUM_VERSION=369907
PLATFORM="$(uname -s)"
case "$PLATFORM" in
(Darwin)
ARCHITECTURE=Mac
DIST_FILE=chrome-mac.zip
;;
(Linux)
ARCHITECTURE=Linux_x64
DIST_FILE=chrome-linux.zip
;;
(*)
echo Unsupported platform $PLATFORM. Exiting ... >&2
exit 3
;;
esac
TMP=$(curl -s "https://omahaproxy.appspot.com/all") || true TMP=$(curl -s "https://omahaproxy.appspot.com/all") || true
oldIFS="$IFS" oldIFS="$IFS"
IFS=' IFS='
@ -47,7 +64,7 @@ if [[ "$EXISTING_VERSION" != "$CHROMIUM_VERSION" ]]; then
while [[ $STATUS == 404 && $NEXT -ge 0 ]] while [[ $STATUS == 404 && $NEXT -ge 0 ]]
do do
echo Fetch Chromium version: ${NEXT} echo Fetch Chromium version: ${NEXT}
STATUS=$(curl "https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/${NEXT}/chrome-linux.zip" -s -w %{http_code} --create-dirs -o $FILE) || true STATUS=$(curl "https://storage.googleapis.com/chromium-browser-snapshots/${ARCHITECTURE}/${NEXT}/${DIST_FILE}" -s -w %{http_code} --create-dirs -o $FILE) || true
NEXT=$[$NEXT-1] NEXT=$[$NEXT-1]
done done