Skip to content

Commit 15afb80

Browse files
committed
fix(build): make perf tests work again
1 parent ccb306c commit 15afb80

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

protractor-shared.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ var config = exports.config = {
155155

156156
jasmineNodeOpts: {
157157
showColors: true,
158-
defaultTimeoutInterval: argv.benchpress ? 80000 : 30000
158+
defaultTimeoutInterval: argv['benchmark'] ? 1200000 : 30000
159159
},
160160
params: {
161161
benchmark: {

scripts/ci/env_dart.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ if [[ -z $ENV_SET ]]; then
7070
export DARTSDK
7171
export DART
7272
export PUB=${PUB:-"$DART_SDK/bin/pub"}
73+
export PUB_CACHE=$DART_SDK/pub-cache
7374
export DARTANALYZER=${DARTANALYZER:-"$DART_SDK/bin/dartanalyzer"}
7475
export DARTDOC=${DARTDOC:-"$DART_SDK/bin/dartdoc"}
7576
export DART_DOCGEN=${DART_DOCGEN:-"$DART_SDK/bin/docgen"}

scripts/jenkins/jenkins_perf.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export ANDROID_SDK="/Users/Shared/jenkins/android-sdk"
66
export PATH+=":$ANDROID_SDK/tools:$ANDROID_SDK/platform-tools"
77
export PATH+=":/usr/local/git/bin"
88

9-
export CHANNEL=stable
9+
export DART_CHANNEL=dev
1010
export ARCH=macos-ia32
1111
export PERF_BROWSERS=ChromeAndroid
1212
export CLOUD_SECRET_PATH="/Users/Shared/jenkins/keys/perf-cloud-secret"
@@ -15,7 +15,12 @@ export GIT_SHA=$(git rev-parse HEAD)
1515
nvm use 0.10
1616

1717
./scripts/ci/init_android.sh
18-
./scripts/ci/install_dart.sh
18+
./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH}
19+
npm cache clean
20+
# use newest npm because of errors during npm install like
21+
# npm ERR! EEXIST, open '/Users/Shared/Jenkins/.npm/e4d0eb16-adable-stream-1-1-13-package-tgz.lock'
22+
npm install -g [email protected]
1923
npm install
20-
./scripts/ci/build.sh
21-
./scripts/ci/test_perf.sh
24+
./scripts/ci/build_js.sh
25+
./scripts/ci/build_dart.sh
26+
./scripts/ci/test_perf.sh

0 commit comments

Comments
 (0)