Merge pull request #79 from angular/master

Update upstream

Author: GulajavaMinistudio

.travis.yml

@@ -20,22 +20,12 @@ env:
     - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
     - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
   global:
-    # node 4 likes the G++ v4.8 compiler
-    # see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
-    - CXX=g++-4.8
     - SAUCE_USERNAME=angular-ci
     - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
     - LOGS_DIR=/tmp/angular-build/logs
     - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
     - secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5
   - export PATH="$HOME/.yarn/bin:$PATH"
@@ -62,6 +52,9 @@ notifications:
 jobs:
   include:
     - stage: deploy
+      # Don't deploy from PRs.
+      # The deployment logic for pushed branches is defined in scripts\travis\build.sh
+      if: type != pull_request
       env:
         - JOB=deploy
       before_script: skip
@@ -85,8 +78,7 @@ jobs:
           on:
             repo: angular/angular.js
             all_branches: true
-            # deploy a new docs version when the commit is tagged on the "latest" npm version
-            condition: $TRAVIS_TAG != '' && $( jq ".distTag" "package.json" | tr -d "\"[:space:]" ) = latest
+            condition: $DEPLOY_DOCS
         - provider: gcs
           skip_cleanup: true
           access_key_id: GOOGLDB7W2J3LFHICF3R
@@ -98,6 +90,5 @@ jobs:
           on:
             repo: angular/angular.js
             all_branches: true
-            # upload the build when the commit is tagged or the branch is "master"
-            condition: $TRAVIS_TAG != '' || ($TRAVIS_PULL_REQUEST = false && $TRAVIS_BRANCH = master)
+            condition: $DEPLOY_CODE
 

Gruntfile.js

@@ -63,7 +63,11 @@ module.exports = function(grunt) {
   NG_VERSION.cdn = versionInfo.cdnVersion;
   var dist = 'angular-' + NG_VERSION.full;
 
-  var deployVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.full;
+  var deployVersion = NG_VERSION.full;
+
+  if (NG_VERSION.isSnapshot) {
+    deployVersion = NG_VERSION.distTag === 'latest' ? 'snapshot-stable' : 'snapshot';
+  }
 
   if (versionInfo.cdnVersion == null) {
     throw new Error('Unable to read CDN version, are you offline or has the CDN not been properly pushed?\n' +

docs/app/src/versions.js

@@ -12,10 +12,16 @@ angular.module('versions', ['currentVersionData', 'allVersionsData'])
             /** @this VersionPickerController */
             function VersionPickerController($location, $window, CURRENT_NG_VERSION, ALL_NG_VERSIONS) {
 
-      var versionStr = CURRENT_NG_VERSION.isSnapshot ? 'snapshot' : CURRENT_NG_VERSION.version;
+      var versionStr = CURRENT_NG_VERSION.version;
+
+      if (CURRENT_NG_VERSION.isSnapshot) {
+        versionStr = CURRENT_NG_VERSION.distTag === 'latest' ? 'snapshot-stable' : 'snapshot';
+      }
 
       this.versions  = ALL_NG_VERSIONS;
-      this.selectedVersion = find(ALL_NG_VERSIONS, function(value) { return value.version.version === versionStr; });
+      this.selectedVersion = find(ALL_NG_VERSIONS, function(value) {
+        return value.version.version === versionStr;
+      });
 
       this.jumpToDocsVersion = function(value) {
         var currentPagePath = $location.path().replace(/\/$/, '');

docs/config/processors/versions-data.js

@@ -55,6 +55,9 @@ module.exports = function generateVersionDocProcessor(gitData) {
 
         if (missesCurrentVersion) versions.push(currentVersion.version);
 
+        // Get the stable release with the highest version
+        var highestStableRelease = versions.reverse().find(semverIsStable);
+
         versions = versions
             .filter(function(versionStr) {
               return blacklist.indexOf(versionStr) === -1;
@@ -82,7 +85,21 @@ module.exports = function generateVersionDocProcessor(gitData) {
         var latest = sortObject(latestMap, reverse(semver.compare))
             .map(function(version) { return makeOption(version, 'Latest'); });
 
-        return [makeOption({version: 'snapshot'}, 'Latest', 'master')]
+        // Generate master and stable snapshots
+        var snapshots = [
+          makeOption(
+            {version: 'snapshot'},
+            'Latest',
+            'master-snapshot'
+          ),
+          makeOption(
+            {version: 'snapshot-stable'},
+            'Latest',
+            createSnapshotStableLabel(highestStableRelease)
+          )
+        ];
+
+        return snapshots
             .concat(latest)
             .concat(versions);
       }
@@ -112,6 +129,18 @@ module.exports = function generateVersionDocProcessor(gitData) {
       function sortObject(obj, cmp) {
         return Object.keys(obj).map(function(key) { return obj[key]; }).sort(cmp);
       }
+
+      // https://github.com/kaelzhang/node-semver-stable/blob/34dd29842409295d49889d45871bec55a992b7f6/index.js#L25
+      function semverIsStable(version) {
+        var semverObj = semver.parse(version);
+        return semverObj === null ? false : !semverObj.prerelease.length;
+      }
+
+      function createSnapshotStableLabel(version) {
+        var label = 'v' + version.replace(/.$/, 'x') + '-snapshot';
+
+        return label;
+      }
     }
   };
 };

lib/versions/version-info.js

@@ -210,6 +210,7 @@ var getSnapshotVersion = function() {
   version.format();
   version.full = version.version + '+' + version.build;
   version.branch = 'master';
+  version.distTag = currentPackage.distTag;
 
   return version;
 };

scripts/code.angularjs.org-firebase/functions/index.js

@@ -169,6 +169,13 @@ function sendStoredFile(request, response) {
   }
 }
 
+const snapshotRegex = /^snapshot(-stable)?\//;
+
+/**
+ * The build folder contains a zip file that is unique per build.
+ * When a new zip file is uploaded into snapshot or snapshot-stable,
+ * delete the previous zip file.
+ */
 function deleteOldSnapshotZip(event) {
   const object = event.data;
 
@@ -179,15 +186,17 @@ function deleteOldSnapshotZip(event) {
 
   const bucket = gcs.bucket(bucketId);
 
-  if (contentType !== 'application/zip' ||
-      !filePath.startsWith('snapshot/') ||
+  const snapshotFolderMatch = filePath.match(snapshotRegex);
+
+  if (!snapshotFolderMatch ||
+      contentType !== 'application/zip' ||
       resourceState === 'not_exists' // Deletion event
     ) {
     return;
   }
 
   bucket.getFiles({
-    prefix: 'snapshot/',
+    prefix: snapshotFolderMatch[0],
     delimiter: '/',
     autoPaginate: false
   }).then(function(data) {
@@ -197,6 +206,8 @@ function deleteOldSnapshotZip(event) {
       return file.metadata.name !== filePath && file.metadata.contentType === 'application/zip';
     });
 
+    console.info(`found ${oldZipFiles.length} old zip files to delete`);
+
     oldZipFiles.forEach(function(file) {
       file.delete();
     });

scripts/code.angularjs.org-firebase/readme.firebase.code.md

@@ -6,6 +6,9 @@ This folder contains the Google Firebase scripts for the code.angularjs.org setu
 firebase.json contains the rewrite rules that route every subdirectory request to the cloud function
 in functions/index.js that serves the docs from the Firebase Google Cloud Storage bucket.
 
+functions/index.js also contains a rule that deletes outdated build zip files
+from the snapshot and snapshot-stable folders when new zip files are uploaded.
+
 The deployment to the Google Cloud Storage bucket happens automatically via Travis. See the travis.yml
 file in the repository root.
 

scripts/travis/build.sh

@@ -18,7 +18,7 @@ case "$JOB" in
     fi
     ;;
   "unit")
-    if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
+    if [[ "$BROWSER_PROVIDER" == "browserstack" ]]; then
       BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_EDGE,BS_iOS_8,BS_iOS_9"
     else
       BROWSERS="SL_Chrome,SL_Chrome-1,SL_Firefox,SL_Firefox-1,SL_Safari_8,SL_Safari_9,SL_IE_9,SL_IE_10,SL_IE_11,SL_EDGE,SL_EDGE-1,SL_iOS"
@@ -46,11 +46,28 @@ case "$JOB" in
     grunt test:travis-protractor --specs="$TARGET_SPECS"
     ;;
   "deploy")
-    # we never deploy on Pull requests, so it's safe to skip the build here
-    if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
+    export DEPLOY_DOCS
+    export DEPLOY_CODE
+
+    DIST_TAG=$( jq ".distTag" "package.json" | tr -d "\"[:space:]" )
+
+    # upload docs if the branch distTag from package.json is "latest" (i.e. stable branch)
+    if [[ "$DIST_TAG" == latest ]]; then
+      DEPLOY_DOCS=true
+    fi
+
+    # upload the build (code + docs) if ...
+    #   the commit is tagged
+    #   - or the branch is "master"
+    #   - or the branch distTag from package.json is "latest" (i.e. stable branch)
+    if [[ "$TRAVIS_TAG" != '' || "$TRAVIS_BRANCH" == master || "$DIST_TAG" == latest ]]; then
+      DEPLOY_CODE=true
+    fi
+
+    if [[ "$DEPLOY_DOCS" || "$DEPLOY_CODE" ]]; then
       grunt prepareFirebaseDeploy
     else
-      echo "Skipping build because Travis has been triggered by Pull Request"
+      echo "Skipping deployment build because conditions have not been met."
     fi
     ;;
   *)