From 3739588e97591f6fa102f8afd0b2248ff692eeca Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Tue, 16 Feb 2016 20:42:48 -0800
Subject: [PATCH] chore: build cjs code prior to launching e2e tests

Closes #6783

Closes #7725
---
 scripts/ci/build_dart_ddc.sh   |  6 +++++-
 scripts/ci/install_chromium.sh | 21 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/build_dart_ddc.sh b/scripts/ci/build_dart_ddc.sh
index 1b80da56f7..c277cde3f7 100755
--- a/scripts/ci/build_dart_ddc.sh
+++ b/scripts/ci/build_dart_ddc.sh
@@ -26,6 +26,7 @@ git clone https://github.com/dart-lang/dev_compiler.git tmp/dev_compiler
   $PUB get)
 
 # Convert TypeScript to Dart
+./node_modules/.bin/gulp build.js.cjs
 ./node_modules/.bin/gulp build/packages.dart
 ./node_modules/.bin/gulp build/pubspec.dart
 node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \
@@ -147,6 +148,9 @@ function killServer () {
 ./node_modules/.bin/gulp serve.js.ddc&
 serverPid=$!
 
+echo CHROM_BIN=$CHROME_BIN
+echo CHROM_BIN_VERSION=`$CHROME_BIN --version`
+
 trap killServer EXIT
 
 # wait for server to come up
@@ -155,7 +159,7 @@ sleep 10
 function runSpec {
   SPEC=$1
   ./node_modules/.bin/protractor protractor-ddc.conf.js \
-      --browsers=${E2E_BROWSERS:-Dartium} \
+      --browsers=${E2E_BROWSERS:-ChromeDesktop} \
       --spec=$SPEC
 }
 
diff --git a/scripts/ci/install_chromium.sh b/scripts/ci/install_chromium.sh
index 206c6b5f4b..21553a14c3 100755
--- a/scripts/ci/install_chromium.sh
+++ b/scripts/ci/install_chromium.sh
@@ -9,7 +9,24 @@ set -e -x
 
 #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
-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
 oldIFS="$IFS"
 IFS='
@@ -47,7 +64,7 @@ if [[ "$EXISTING_VERSION" != "$CHROMIUM_VERSION" ]]; then
   while [[ $STATUS == 404 && $NEXT -ge 0 ]]
   do
     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]
   done