From 65021c82c6d440e078e635f1f58a1f263041ac95 Mon Sep 17 00:00:00 2001
From: Kieran Sedgwick <kieran.sedgwick@gmail.com>
Date: Wed, 19 Aug 2015 15:12:58 -0400
Subject: [PATCH] Fixed #408 - Add a production branch for auto prod deploys

---
 .travis.yml     | 37 +++++++++++++++++++++++++------------
 CONTRIBUTING.md |  6 ++++++
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c8c756ce0..c7bd68486 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,31 @@ before_script:
 branches:
   only:
   - bramble
+  - production
 notifications:
   irc: "irc.mozilla.org#thimble"
 deploy:
-  provider: s3
-  access_key_id: AKIAJZZYAKJA33TQEHLA
-  secret_access_key:
-    secure: PUmptcr3naHfuC1FU8q7F3OEbnbCzfKaTYleJDpYjz7lSt24zoXD5epaTcusva4SafMS3I5NeKZ79YmDrn2ONEyLdyPCLKNScOFEClhjFNeuMOrf63fK3MO1RwNtJ2Rvjwwi2k+/pVaVUXKcr287JWywDZUZfYp7DjxJdNU6JZ0=
-  bucket: mozillathimblelivepreview.net
-  local-dir: dist
-  upload-dir: bramble/dist
-  skip_cleanup: true
-  detect_encoding: true
-  on:
-    repo: humphd/brackets
-    branch: bramble
+  - provider: s3
+    access_key_id: AKIAJZZYAKJA33TQEHLA
+    secret_access_key:
+      secure: PUmptcr3naHfuC1FU8q7F3OEbnbCzfKaTYleJDpYjz7lSt24zoXD5epaTcusva4SafMS3I5NeKZ79YmDrn2ONEyLdyPCLKNScOFEClhjFNeuMOrf63fK3MO1RwNtJ2Rvjwwi2k+/pVaVUXKcr287JWywDZUZfYp7DjxJdNU6JZ0=
+    bucket: mozillathimblelivepreview.net
+    local-dir: dist
+    upload-dir: bramble/staging/dist
+    skip_cleanup: true
+    detect_encoding: true
+    on:
+      repo: humphd/brackets
+      branch: bramble
+  - provider: s3
+    access_key_id: AKIAJZZYAKJA33TQEHLA
+    secret_access_key:
+      secure: PUmptcr3naHfuC1FU8q7F3OEbnbCzfKaTYleJDpYjz7lSt24zoXD5epaTcusva4SafMS3I5NeKZ79YmDrn2ONEyLdyPCLKNScOFEClhjFNeuMOrf63fK3MO1RwNtJ2Rvjwwi2k+/pVaVUXKcr287JWywDZUZfYp7DjxJdNU6JZ0=
+    bucket: mozillathimblelivepreview.net
+    local-dir: dist
+    upload-dir: bramble/production/dist
+    skip_cleanup: true
+    detect_encoding: true
+    on:
+      repo: humphd/brackets
+      branch: production
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f5d0acc43..2ce990fde 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,9 @@
+# Bramble
+
+### Deployment
+
+Anything merged into the branch `bramble` will be automatically deployed to staging. To deploy to production, push changes to the `production` branch.
+
 # The Basics
 
 ### Filing a bug