chore(deploy): rename deploy folders

.gitignore

@@ -1,4 +1,5 @@
 /build/
+/deploy/
 /benchpress-build/
 .DS_Store
 gen_docs.disable

.travis.yml

@@ -95,7 +95,7 @@ jobs:
           secret_access_key:
             secure: tHIFdSq55qkyZf9zT/3+VkhUrTvOTMuswxXU3KyWaBrSieZqG0UnUDyNm+n3lSfX95zEl/+rJAWbfvhVSxZi13ndOtvRF+MdI1cvow2JynP0aDSiPffEvVrZOmihD6mt2SlMfhskr5FTduQ69kZG6DfLcve1PPDaIwnbOv3phb8=
           bucket: code-angularjs-org-338b8.appspot.com
-          local-dir: uploadCode
+          local-dir: deploy/code
           detect_encoding: true # detects gzip compression
           on:
             repo: angular/angular.js

Gruntfile.js

@@ -163,7 +163,10 @@ module.exports = function(grunt) {
     clean: {
       build: ['build'],
       tmp: ['tmp'],
-      deploy: ['uploadDocs', 'uploadCode']
+      deploy: [
+        'deploy/docs',
+        'deploy/code'
+      ]
     },
 
     eslint: {
@@ -332,7 +335,7 @@ module.exports = function(grunt) {
           {
             cwd: 'build',
             src: '**/*.{zip,jpg,jpeg,png}',
-            dest: 'uploadCode/' + deployVersion + '/',
+            dest: 'deploy/code/' + deployVersion + '/',
             expand: true
           }
         ]
@@ -342,14 +345,16 @@ module.exports = function(grunt) {
           // The source files are needed by the embedded examples in the docs app.
           {
             src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'],
-            dest: 'uploadDocs/',
+            dest: 'deploy/docs/',
             expand: true,
             flatten: true
           },
           {
             cwd: 'build/docs',
             src: '**',
-            dest: 'uploadDocs/',
+            dest: 'deploy/docs/',
+            expand: true
+          }
             expand: true
           }
         ]
@@ -374,7 +379,7 @@ module.exports = function(grunt) {
         src: ['**', '!**/*.{zip,png,jpeg,jpg}'],
         cwd: 'build',
         expand: true,
-        dest: 'uploadCode/' + deployVersion + '/'
+        dest: 'deploy/code/' + deployVersion + '/'
       }
     },
 
@@ -474,7 +479,7 @@ module.exports = function(grunt) {
     'merge-conflict',
     'eslint'
   ]);
-  grunt.registerTask('prepareFirebaseDeploy', [
+  grunt.registerTask('prepareDeploy', [
     'package',
     'compress:deployFirebaseCode',
     'copy:deployFirebaseCode',

lib/grunt/utils.js

@@ -297,10 +297,12 @@ module.exports = {
   // Our Firebase projects are in subfolders, but Travis expects them in the root,
   // so we need to modify the upload folder path and copy the file into the root
   firebaseDocsJsonForTravis: function() {
-    var fileName = 'scripts/docs.angularjs.org-firebase/firebase.json';
+    var docsScriptFolder = 'scripts/docs.angularjs.org-firebase/';
+
+    var fileName = docsScriptFolder + 'firebase.json';
     var json = grunt.file.readJSON(fileName);
 
-    json.hosting.public = 'uploadDocs';
+    json.hosting.public = 'deploy/docs';
 
     grunt.file.write('firebase.json', JSON.stringify(json));
   }

scripts/docs.angularjs.org-firebase/firebase.json

@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "public": "../../uploadDocs",
+    "public": "../../deploy/docs",
     "ignore": [
       "/index.html",
       "/index-debug.html",

scripts/travis/build.sh

@@ -79,7 +79,7 @@ case "$JOB" in
     fi
 
     if [[ "$DEPLOY_DOCS" == true || "$DEPLOY_CODE" == true ]]; then
-      grunt prepareFirebaseDeploy
+      grunt prepareDeploy
     else
       echo "Skipping deployment build because conditions have not been met."
     fi