summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-11-29 18:37:53 +0800
committerGitHub <noreply@github.com>2017-11-29 18:37:53 +0800
commit9a93df9b58b5c67b4cea58a9ce01c59efbd27a40 (patch)
treefdad8501321b37b888c97e8163a07f9de29ac2d5 /.travis.yml
parentRollup merge of #46330 - SimonSapin:patch-6, r=kennytm (diff)
parentDeploy builds both with asserts enabled and asserts disabled to CI. (diff)
downloadgrust-9a93df9b58b5c67b4cea58a9ce01c59efbd27a40.tar.gz
grust-9a93df9b58b5c67b4cea58a9ce01c59efbd27a40.tar.bz2
grust-9a93df9b58b5c67b4cea58a9ce01c59efbd27a40.tar.xz
Rollup merge of #46354 - Mark-Simulacrum:alt-try, r=alexcrichton
Deploy builds both with asserts enabled and asserts disabled to CI. This also removes uploads to the 'try' bucket, and instead dumps everything into the two rustc-builds and rustc-builds-alt buckets. This makes lives easier, as there is only one location for a given "type" of build, and since we have the git commit hash in the filenames, this is fine; we won't run into uploads of the same commit. cc @aidanhs -- this will break crater's logic for downloading `try#xxx` commits since the try bucket won't be uploaded into r? @alexcrichton
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml29
1 files changed, 23 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 7e750a0422..8ce3aadacc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
16 if: type = pull_request OR branch = auto 16 if: type = pull_request OR branch = auto
17 17
18 - env: IMAGE=dist-x86_64-linux DEPLOY=1 18 - env: IMAGE=dist-x86_64-linux DEPLOY=1
19 if: branch = auto 19 if: branch = try OR branch = auto
20 20
21 # "alternate" deployments, these are "nightlies" but have LLVM assertions 21 # "alternate" deployments, these are "nightlies" but have LLVM assertions
22 # turned on, they're deployed to a different location primarily for 22 # turned on, they're deployed to a different location primarily for
@@ -309,22 +309,39 @@ deploy:
309 branch: auto 309 branch: auto
310 condition: $DEPLOY = 1 310 condition: $DEPLOY = 1
311 311
312 # this is the same as the above deployment provider except that it uploads to
313 # a slightly different directory and has a different trigger
312 - provider: s3 314 - provider: s3
313 bucket: rust-lang-ci2 315 bucket: rust-lang-ci2
314 skip_cleanup: true 316 skip_cleanup: true
315 local_dir: deploy 317 local_dir: deploy
316 upload_dir: rustc-builds-try 318 upload_dir: rustc-builds-alt
317 acl: public_read 319 acl: public_read
318 region: us-west-1 320 region: us-west-1
319 access_key_id: AKIAJVBODR3IA4O72THQ 321 access_key_id: AKIAJVBODR3IA4O72THQ
320 secret_access_key: 322 secret_access_key:
321 secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0=" 323 secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
322 on: 324 on:
323 branch: try 325 branch: auto
324 condition: $DEPLOY_ALT = 1 326 condition: $DEPLOY_ALT = 1
325 327
326 # this is the same as the above deployment provider except that it uploads to 328 # These two providers are the same as the two above, except deploy on the
327 # a slightly different directory and has a different trigger 329 # try branch. Travis does not appear to provide a way to use "or" in these
330 # conditions.
331 - provider: s3
332 bucket: rust-lang-ci2
333 skip_cleanup: true
334 local_dir: deploy
335 upload_dir: rustc-builds
336 acl: public_read
337 region: us-west-1
338 access_key_id: AKIAJVBODR3IA4O72THQ
339 secret_access_key:
340 secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
341 on:
342 branch: try
343 condition: $DEPLOY = 1
344
328 - provider: s3 345 - provider: s3
329 bucket: rust-lang-ci2 346 bucket: rust-lang-ci2
330 skip_cleanup: true 347 skip_cleanup: true
@@ -336,5 +353,5 @@ deploy:
336 secret_access_key: 353 secret_access_key:
337 secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0=" 354 secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
338 on: 355 on:
339 branch: auto 356 branch: try
340 condition: $DEPLOY_ALT = 1 357 condition: $DEPLOY_ALT = 1