#6075

.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory": "bower_components"
-}
+  "directory" : "bower_components"
+}

.gitignore

@@ -29,8 +29,11 @@ tmp
 pubspec.lock
 .c9
 .idea/
+.settings/
 *.swo
 modules/.settings
+.vscode
+modules/.vscode
 
 # Don't check in secret files
 *secret.js
@@ -39,3 +42,9 @@ modules/.settings
 npm-debug.log
 
 /docs/bower_components/
+
+# build-analytics
+.build-analytics
+
+# built dart payload tests
+/modules_dart/payload/**/build

.nvmrc

@@ -1 +1 @@
-0.12
+4.2.1

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-- '0.12'
+- '4.2.1'
 
 branches:
   except:
@@ -19,7 +19,11 @@ env:
   - LOGS_DIR=/tmp/angular-build/logs
   - SAUCE_USERNAME=angular-ci
   - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
+  - BROWSER_STACK_USERNAME=angularteam1
+  - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
   - ARCH=linux-x64
+  - DART_DEV_VERSION=latest
+  - DART_STABLE_VERSION=latest
   # Token for tsd to increase github rate limit
   # See https://github.com/DefinitelyTyped/tsd#tsdrc
   # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
@@ -30,49 +34,68 @@ env:
   # GITHUB_TOKEN_ANGULAR
   - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
   matrix:
-    # Order: slowest build on top, so that we don't hog VMs while waiting for others to complete.
-    - MODE=dart DART_CHANNEL=stable
-    - MODE=dart DART_CHANNEL=dev
-    - MODE=saucelabs DART_CHANNEL=dev
-    - MODE=dart_experimental DART_CHANNEL=dev
-    - MODE=js DART_CHANNEL=dev
-    - MODE=lint DART_CHANNEL=dev
+    # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
+    - MODE=dart DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
+    - MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=browserstack DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=build_only DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
+    - MODE=lint DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=payload DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
 
 matrix:
   allow_failures:
-  - env: "MODE=saucelabs DART_CHANNEL=dev"
+  - env: "MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
+  - env: "MODE=browserstack DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
+  - env: "MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
+  # TODO(alxhub): remove when dartdoc #1039 is in dev channel
+  - env: "MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
 
 addons:
   firefox: "38.0"
 
 before_install:
+- node tools/analytics/build-analytics start ci job
+- node tools/analytics/build-analytics start ci before_install
 - echo ${TSDRC} > .tsdrc
 - export DISPLAY=:99.0
 - export GIT_SHA=$(git rev-parse HEAD)
 - ./scripts/ci/init_android.sh
-- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH}
+- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
 - sh -e /etc/init.d/xvfb start
 - if [[ -e SKIP_TRAVIS_TESTS ]]; then { cat SKIP_TRAVIS_TESTS ; exit 0; } fi
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
+- node tools/analytics/build-analytics success ci before_install
 
 install:
-  # Update npm
-  - npm install -g npm@2.9.1
-  - npm --version
+  - node tools/analytics/build-analytics start ci install
   # Check the size of caches
   - du -sh ./node_modules || true
   # Install npm dependecies
   - npm install
+  - node tools/analytics/build-analytics success ci install
 
 before_script:
+- node tools/analytics/build-analytics start ci before_script
 - mkdir -p $LOGS_DIR
 - ./scripts/ci/presubmit-queue-setup.sh
+- node tools/analytics/build-analytics success ci before_script
 
 script:
+- node tools/analytics/build-analytics start ci script
 - ./scripts/ci/build_and_test.sh ${MODE}
+- node tools/analytics/build-analytics success ci script
 
 after_script:
+- node tools/analytics/build-analytics start ci after_script
 - ./scripts/ci/print-logs.sh
 - ./scripts/ci/after-script.sh
+- ./scripts/publish/publish-build-artifacts.sh
+- node tools/analytics/build-analytics success ci after_script
+- if [[ $TRAVIS_TEST_RESULT -eq 0 ]]; then node tools/analytics/build-analytics success ci job; else node tools/analytics/build-analytics error ci job; fi
 
 notifications:
   webhooks:
@@ -98,24 +121,12 @@ deploy:
     bucket: angular2-snapshots
     # don't delete generated files
     skip_cleanup: true
-    # serve to public at https://storage.googleapis.com/angular2-snapshots/SHA/dart_stable/dist.tgz
+    # serve to public at https://storage.googleapis.com/angular2-snapshots/SHA/dist.tgz
     acl: public-read
     # upload the .tgz archive created in scripts/ci/build_and_test.sh
     local-dir: deploy
     # create a "subdirectory" for each commit
-    upload-dir: $TRAVIS_COMMIT/dart_stable
+    upload-dir: $TRAVIS_COMMIT
     on:
       repo: angular/angular
-      condition: "$MODE = dart && $DART_CHANNEL = stable"
-  - provider: gcs
-    access_key_id: GOOGIOQTDBEOPBUAWFZQ
-    secret_access_key:
-      secure: "MEDggllZ5fw4wI9CEUi8WR6jKsKXqdRF/DLxSNC2JpzM5RlVeBm0uqjntYT1Cf1dASvQ2/+vZCUikL/3A48NcoEYRHXGmxu8D6t/SvleQD8Xv434xFOdsa2QqP/HiCtqCLOI5jJz1JVoB5nNyKKZ33ogTUL1LV1TfcrAioyizW8="
-    bucket: angular2-snapshots
-    skip_cleanup: true
-    acl: public-read
-    local-dir: deploy
-    upload-dir: $TRAVIS_COMMIT/js
-    on:
-      repo: angular/angular
-      condition: "$MODE = js"
+      condition: "$MODE = build_only"