about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-03-21 22:03:24 +0800
committerkennytm <kennytm@gmail.com>2018-03-21 22:03:24 +0800
commitc7bdd371a64ff5b9b86680fd77dd56d1eeabb76c (patch)
tree1a2cbf9825ad8abd7fe49f913729124c36770e94
parentc19264fa835a1eca86de4fd2e86a87b3919e57cf (diff)
downloadrust-c7bdd371a64ff5b9b86680fd77dd56d1eeabb76c.tar.gz
rust-c7bdd371a64ff5b9b86680fd77dd56d1eeabb76c.zip
Revert "Apply a fix to travis-ci/dpl#788 manually until dpl 1.9.5 is released."
This reverts commit 20e65f11f3bb0538c5676425e74b593676bd0f12.
-rw-r--r--.travis.yml8
1 files changed, 0 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index b2aba305aed..41ea0c9afa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -318,8 +318,6 @@ before_deploy:
 
 deploy:
   - provider: s3
-    edge:
-      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy
@@ -336,8 +334,6 @@ 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
@@ -355,8 +351,6 @@ 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
@@ -371,8 +365,6 @@ deploy:
       condition: $DEPLOY = 1
 
   - provider: s3
-    edge:
-      branch: s3-eager-autoload
     bucket: rust-lang-ci2
     skip_cleanup: true
     local_dir: deploy