Rollup merge of #49217 - kennytm:fix-dpl-788, r=alexcrichton

Apply temporary fix of travis-ci/dpl#788.
This commit is contained in:
kennytm 2018-03-21 06:18:33 +08:00 committed by GitHub
commit de9fb3be1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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