diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-22 17:51:38 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-03-22 22:43:52 +0800 |
| commit | a10db970692fbf1907aa198c542d30ffc9449d7d (patch) | |
| tree | 6100ad37c7fa5f6f3d3a49e8bcdcbbe7b38c0389 | |
| parent | 87f5a4b6f299784b97abdece47445d27693314b6 (diff) | |
| parent | c7bdd371a64ff5b9b86680fd77dd56d1eeabb76c (diff) | |
| download | rust-a10db970692fbf1907aa198c542d30ffc9449d7d.tar.gz rust-a10db970692fbf1907aa198c542d30ffc9449d7d.zip | |
Rollup merge of #49234 - kennytm:revert-fix-dpl-788, r=alexcrichton
dpl 1.9.5 has been released, revert #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.
| -rw-r--r-- | .travis.yml | 8 |
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 |