Auto merge of #26238 - servo:jdm-patch-36, r=Manishearth

Only enable RUST_BACKTRACE in non-mac build environment on CI.

This should help work around #26192 and would explain why we're still seeing it on CI after #26217.
This commit is contained in:
bors-servo 2020-04-21 04:05:06 -04:00 committed by GitHub
commit c1f85c2a22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -104,13 +104,13 @@ build_dependencies_artifacts_expire_in = "1 month"
log_artifacts_expire_in = "1 year" log_artifacts_expire_in = "1 year"
build_env = { build_env = {
"RUST_BACKTRACE": "1",
"RUSTFLAGS": "-Dwarnings", "RUSTFLAGS": "-Dwarnings",
"CARGO_INCREMENTAL": "0", "CARGO_INCREMENTAL": "0",
} }
unix_build_env = { unix_build_env = {
} }
linux_build_env = { linux_build_env = {
"RUST_BACKTRACE": "1", # https://github.com/servo/servo/issues/26192
"SHELL": "/bin/dash", # For SpiderMonkeys build system "SHELL": "/bin/dash", # For SpiderMonkeys build system
"CCACHE": "sccache", "CCACHE": "sccache",
"RUSTC_WRAPPER": "sccache", "RUSTC_WRAPPER": "sccache",