Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic error from “Don’t run warnings into errors when trying Nightly”

Browse source 
https://github.com/servo/servo/pull/22323
This commit is contained in:
Simon Sapin 2018-12-02 11:21:52 +01:00
parent d657a6c6e8
commit 6e20450247
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/taskcluster/decision_task.py
View file

@ -43,7 +43,7 @@ log_artifacts_expire_in = "1 year"
build_env = { build_env = {
"RUST_BACKTRACE": "1", "RUST_BACKTRACE": "1",
"RUSTFLAGS": "-Dwarnings", # If changing this, also adjust with_rust_nightly() "RUSTFLAGS": "-Dwarnings",
"CARGO_INCREMENTAL": "0", "CARGO_INCREMENTAL": "0",
} }
unix_build_env = { unix_build_env = {
@ -101,7 +101,7 @@ def macos_unit():
def with_rust_nightly(): def with_rust_nightly():
modified_build_env = dict(build_env) modified_build_env = dict(build_env)
flags = build_env.pop("RUSTFLAGS").split(" ") flags = modified_build_env.pop("RUSTFLAGS").split(" ")
flags.remove("-Dwarnings") flags.remove("-Dwarnings")
if flags: # pragma: no cover if flags: # pragma: no cover
modified_build_env["RUSTFLAGS"] = " ".join(flags) modified_build_env["RUSTFLAGS"] = " ".join(flags)
@ -164,8 +164,8 @@ def android_x86():
def windows_unit(): def windows_unit():
return ( return (
windows_build_task("Build + unit tests") windows_build_task("Dev build + unit tests")
.with_treeherder("Windows x64", "debug") .with_treeherder("Windows x64")
.with_script( .with_script(
# Not necessary as this would be done at the start of `build`, # Not necessary as this would be done at the start of `build`,
# but this allows timing it separately. # but this allows timing it separately.