Skip to content

Commit

Permalink
Rollup merge of rust-lang#49234 - kennytm:revert-fix-dpl-788, r=alexc…
Browse files Browse the repository at this point in the history
…richton

dpl 1.9.5 has been released, revert rust-lang#49217.

dpl 1.9.5 has been released which includes travis-ci/dpl#789, so we could move back to the standard Travis settings before that `s3-eager-autoload` branch is removed.
  • Loading branch information
kennytm committed Mar 22, 2018
2 parents 87f5a4b + c7bdd37 commit a10db97
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ before_deploy:

deploy:
- provider: s3
edge:
branch: s3-eager-autoload
bucket: rust-lang-ci2
skip_cleanup: true
local_dir: deploy
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a10db97

Please sign in to comment.