about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-21 06:18:33 +0800
committerGitHub <noreply@github.com>2018-03-21 06:18:33 +0800
commitde9fb3be1f7c873be4ae5111e20c7d776cd535c7 (patch)
treeddca9d0818576628355ac46f1357c1e08f3960ef
parent5f7d7c886c04408fa7f155bd308181dac4afe288 (diff)
parent20e65f11f3bb0538c5676425e74b593676bd0f12 (diff)
downloadrust-de9fb3be1f7c873be4ae5111e20c7d776cd535c7.tar.gz
rust-de9fb3be1f7c873be4ae5111e20c7d776cd535c7.zip
Rollup merge of #49217 - kennytm:fix-dpl-788, r=alexcrichton
Apply temporary fix of travis-ci/dpl#788.
-rw-r--r--.travis.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 41ea0c9afa8..b2aba305aed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -318,6 +318,8 @@ before_deploy:
 
 deploy:
   - provider: s3
+    edge:
+      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy
@@ -334,6 +336,8 @@ deploy:
   # this is the same as the above deployment provider except that it uploads to
   # a slightly different directory and has a different trigger
   - provider: s3
+    edge:
+      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy
@@ -351,6 +355,8 @@ deploy:
   # try branch. Travis does not appear to provide a way to use "or" in these
   # conditions.
   - provider: s3
+    edge:
+      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy
@@ -365,6 +371,8 @@ deploy:
       condition: $DEPLOY = 1
 
   - provider: s3
+    edge:
+      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy