Skip to content

Commit 3739588

Browse files
yjbanovmhevery
authored andcommitted
chore: build cjs code prior to launching e2e tests
Closes angular#6783 Closes angular#7725
1 parent 0730b75 commit 3739588

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

scripts/ci/build_dart_ddc.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ git clone https://github.com/dart-lang/dev_compiler.git tmp/dev_compiler
2626
$PUB get)
2727

2828
# Convert TypeScript to Dart
29+
./node_modules/.bin/gulp build.js.cjs
2930
./node_modules/.bin/gulp build/packages.dart
3031
./node_modules/.bin/gulp build/pubspec.dart
3132
node ./scripts/ci/dart_ddc/pubspec_for_ddc.js \
@@ -147,6 +148,9 @@ function killServer () {
147148
./node_modules/.bin/gulp serve.js.ddc&
148149
serverPid=$!
149150

151+
echo CHROM_BIN=$CHROME_BIN
152+
echo CHROM_BIN_VERSION=`$CHROME_BIN --version`
153+
150154
trap killServer EXIT
151155

152156
# wait for server to come up
@@ -155,7 +159,7 @@ sleep 10
155159
function runSpec {
156160
SPEC=$1
157161
./node_modules/.bin/protractor protractor-ddc.conf.js \
158-
--browsers=${E2E_BROWSERS:-Dartium} \
162+
--browsers=${E2E_BROWSERS:-ChromeDesktop} \
159163
--spec=$SPEC
160164
}
161165

scripts/ci/install_chromium.sh

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,24 @@ set -e -x
99

1010
#Build version read from the OmahaProxy CSV Viewer at https://www.chromium.org/developers/calendar
1111
#Let's use the following version of Chromium, and inform about availability of newer build from https://omahaproxy.appspot.com/all
12-
CHROMIUM_VERSION=359700
12+
CHROMIUM_VERSION=369907
13+
14+
PLATFORM="$(uname -s)"
15+
case "$PLATFORM" in
16+
(Darwin)
17+
ARCHITECTURE=Mac
18+
DIST_FILE=chrome-mac.zip
19+
;;
20+
(Linux)
21+
ARCHITECTURE=Linux_x64
22+
DIST_FILE=chrome-linux.zip
23+
;;
24+
(*)
25+
echo Unsupported platform $PLATFORM. Exiting ... >&2
26+
exit 3
27+
;;
28+
esac
29+
1330
TMP=$(curl -s "https://omahaproxy.appspot.com/all") || true
1431
oldIFS="$IFS"
1532
IFS='
@@ -47,7 +64,7 @@ if [[ "$EXISTING_VERSION" != "$CHROMIUM_VERSION" ]]; then
4764
while [[ $STATUS == 404 && $NEXT -ge 0 ]]
4865
do
4966
echo Fetch Chromium version: ${NEXT}
50-
STATUS=$(curl "https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/${NEXT}/chrome-linux.zip" -s -w %{http_code} --create-dirs -o $FILE) || true
67+
STATUS=$(curl "https://storage.googleapis.com/chromium-browser-snapshots/${ARCHITECTURE}/${NEXT}/${DIST_FILE}" -s -w %{http_code} --create-dirs -o $FILE) || true
5168
NEXT=$[$NEXT-1]
5269
done
5370

0 commit comments

Comments
 (0)