From 45c75bbaac3aade5f0cd254cda041d80b1fdf080 Mon Sep 17 00:00:00 2001
From: edunham <edunham@mozilla.com>
Date: Thu, 25 Jun 2015 22:58:54 -0700
Subject: [PATCH 1/2] CloudFront Invalidation, re-encrypt file for right org

Also organize and document the .travis.yml
---
 .travis.yml                | 11 ++++++++++-
 _cf_s3_invalidator.yml.enc |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 _cf_s3_invalidator.yml.enc

diff --git a/.travis.yml b/.travis.yml
index 9437933c0..c85a85c0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,15 @@
 language: ruby
 rvm:
 - 2.1
+
+# Cloudfront invalidation: Decrypt credentials, then run 
+# https://github.com/laurilehmijoki/cf-s3-invalidator if build succeeded
+before_install:
+- openssl aes-256-cbc -K $encrypted_13e2bd2b9e2d_key -iv $encrypted_13e2bd2b9e2d_iv -in _cf_s3_invalidator.yml.enc -out _cf_s3_invalidator.yml -d
+install: cf-s3-invalidator
+after_success: cf-s3-inv
+
+# Build and deploy the site to the S3 bucket on push to master
 script: jekyll build
 branches:
   only:
@@ -9,7 +18,7 @@ deploy:
   provider: s3
   access_key_id: AKIAIR4V3CAS724EMHFQ
   secret_access_key:
-    secure: Gg8T6boIjCYXZX+e4Il7LEyU6QQoHXGnBJcI4I5ODNsXpPjeBI2eER6BbwFd75RwfKOG4SW+K0DXKMyItpzPIg5GE4TPlrNPMB6ikV6bsrZLuP1BnpV4AwdpfhpJ1RY7F3DlOAiVvPthiDHeINAaca0LOVgv2c9H5LlOZj72Y3DDRn8NH9YTPGsPDEipq7q4ieJBuTNpKhPio4ii+oZQMWJPwpwWuTw0Fgb1GUw2Usw9Cl9FeYntrSL7LW45Eazu1NPfWQWgMLQ1MCQEntmBJyOGSKbp6uyy3607eLJ+L3dZhX+trXSOKR1qKI/pNp7TGbTbqbB8+x3UxJe2CDWkBGiNbd8SXmC41crRm6rnGnbVZV7ASeXWV2D4j2I+kuVFXtTPlf1N7D9ND05SEtSMUgTUuJ9reZK5BgybrYt2MgXsUhXzl0VecwBWVkX0zc7S3Ny3oZFK2kQA/Z/rNKUi5aqzWxF/bGDpIseR7Mqyz+VQw801D3T9qX6RfTwme4q04Qbud2h7v5Emn+hIUOa6nXXa6zdopX1H8hbKTON5+/gG1WJzbWfMndQWpMDYjtlhRODb0MCJ/NB4nMZ5dNREyAODZ1yN590i4a6w55kr6OUu3L2S53XewK1dUFGU2PgqILDxa9zNivxVnXbPObecijWYY9cOpv/PYQoeBlTbYXY=
+    secure: "DUpFkSvaCRntAEOmXO0uavWY5XELauqzniEss5OcY/lgzdRkW1gndbDf88+Qy3cfI9sA5H66z+n1pA205FJoywNAsaoo370DGwcfP7/hzerH1PvdfcebVVCPdbLCqySuMEt87xarr5k9UIV2OyNzU3CjpQlGTsiCgGejgpis3pA="
   bucket: www-rust-lang-org
   acl: public_read
   skip_cleanup: true
diff --git a/_cf_s3_invalidator.yml.enc b/_cf_s3_invalidator.yml.enc
new file mode 100644
index 000000000..b71c55689
--- /dev/null
+++ b/_cf_s3_invalidator.yml.enc
@@ -0,0 +1,3 @@
+<�M�	�E��ӬJ6�κQ�T|���I�:N6��j�N���
+��P���[�:�9�X���k8\��i
+�NF��Z���'�I���G˕��}ak*�,Cc�
C�'Έ�{���mR(:/��ܺw#�
\ No newline at end of file

From 41270d86b9da7dcf9602d6c4f1c1bc8df924f079 Mon Sep 17 00:00:00 2001
From: edunham <edunham@mozilla.com>
Date: Mon, 3 Aug 2015 11:18:50 -0700
Subject: [PATCH 2/2] Skip impossible steps when building pull requests

---
 .travis.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c85a85c0f..a2441b922 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,16 @@ language: ruby
 rvm:
 - 2.1
 
-# Cloudfront invalidation: Decrypt credentials, then run 
+# Cloudfront invalidation: If not PR, decrypt credentials, then run 
 # https://github.com/laurilehmijoki/cf-s3-invalidator if build succeeded
 before_install:
-- openssl aes-256-cbc -K $encrypted_13e2bd2b9e2d_key -iv $encrypted_13e2bd2b9e2d_iv -in _cf_s3_invalidator.yml.enc -out _cf_s3_invalidator.yml -d
-install: cf-s3-invalidator
-after_success: cf-s3-inv
+- [ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_13e2bd2b9e2d_key -iv $encrypted_13e2bd2b9e2d_iv -in _cf_s3_invalidator.yml.enc -out _cf_s3_invalidator.yml -d
+install: 
+- [ "${TRAVIS_PULL_REQUEST}" = "false" ] && cf-s3-invalidator
+after_success: 
+- [ "${TRAVIS_PULL_REQUEST}" = "false" ] && cf-s3-inv
 
-# Build and deploy the site to the S3 bucket on push to master
+# Build and deploy the site to the S3 bucket on push to master, unless PR
 script: jekyll build
 branches:
   only:
@@ -27,3 +29,4 @@ deploy:
   on:
     repo: rust-lang/rust-www
     branch: master
+    condition: "${TRAVIS_PULL_REQUEST}" = "false"