From 9bcc7d2eb880b018433f451ebee720be309d8ecf Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 13:47:31 +0200 Subject: [PATCH 1/8] [Do not merge] Rustc bisect --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 009c84eceb4f..0b555347eddd 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-08-31 +nightly-2017-09-04 From 29a028df959f9b5d1f92a6478c2a35fc8b3185c4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 14:55:44 +0200 Subject: [PATCH 2/8] Bisect --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 0b555347eddd..cd8ce793ec50 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-09-04 +nightly-2017-09-06 From 9f9648f4c692ab6cd5dbad648422a38dc20a7bc2 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 16:43:49 +0200 Subject: [PATCH 3/8] Bisect --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index cd8ce793ec50..af536b8a86e8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-09-06 +nightly-2017-09-07 From c5e68696db531f02d6eddba62bf6fac2df2fb647 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 18:12:37 +0200 Subject: [PATCH 4/8] Bisect --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index af536b8a86e8..6a96eebe488d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-09-07 +nightly-2017-09-08 From e738503a47a10c18264e23570622d2edc1ce42ae Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 19:39:59 +0200 Subject: [PATCH 5/8] Revert "Bisect" This reverts commit c5e68696db531f02d6eddba62bf6fac2df2fb647. --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 6a96eebe488d..af536b8a86e8 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-09-08 +nightly-2017-09-07 From 043474e053e0c2b02d5ad021a1b5beb223838dc4 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 21:05:40 +0200 Subject: [PATCH 6/8] Bisect --- python/servo/bootstrap_commands.py | 20 +++++++++++--------- rust-toolchain | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index dfb88b74272a..1d975e8f8888 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -89,13 +89,14 @@ def bootstrap_rustc(self, force=False, target=[], stable=False): if stable: base_url = static_s3 else: - import toml - import re - channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date()) - version_string = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["version"] - short_commit = re.search("\(([0-9a-f]+) ", version_string).group(1) - commit_api = "https://api.github.com/repos/rust-lang/rust/commits/" + short_commit - nightly_commit_hash = json.load(urllib2.urlopen(commit_api))["sha"] +# import toml +# import re +# channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date()) +# version_string = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["version"] +# short_commit = re.search("\(([0-9a-f]+) ", version_string).group(1) +# commit_api = "https://api.github.com/repos/rust-lang/rust/commits/" + short_commit +# nightly_commit_hash = json.load(urllib2.urlopen(commit_api))["sha"] + nightly_commit_hash = self.rust_nightly_date() base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" if not self.config["build"]["llvm-assertions"]: @@ -137,7 +138,8 @@ def bootstrap_rustc(self, force=False, target=[], stable=False): if self.use_stable_rust(): std_url = static_s3 + "/" + tarball else: - std_url = static_s3 + "/" + self.rust_nightly_date() + "/" + tarball + ci = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" + std_url = ci + "/" + self.rust_nightly_date() + "/" + tarball download_file("Host rust library for target %s" % target_triple, std_url, tgz_file) print("Extracting Rust stdlib for target %s..." % target_triple) @@ -207,7 +209,7 @@ def bootstrap_cargo(self, force=False): os.makedirs(cargo_dir) tgz_file = "cargo-nightly-%s.tar.gz" % host_triple() - nightly_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/%s/%s" % \ + nightly_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/%s" % \ (self.rust_nightly_date(), tgz_file) download_file("Cargo nightly", nightly_url, tgz_file) diff --git a/rust-toolchain b/rust-toolchain index af536b8a86e8..e09d60425b1c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-09-07 +nightly-05e3c96d36b5281e969b5e79b92d671c7872bf83 From b5fd42acee6b9f8e6e8b5ced15c0caa8804655ed Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 11 Sep 2017 22:19:57 +0200 Subject: [PATCH 7/8] Bisect --- python/servo/bootstrap_commands.py | 7 ------- rust-toolchain | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 1d975e8f8888..419c61e491e6 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -89,13 +89,6 @@ def bootstrap_rustc(self, force=False, target=[], stable=False): if stable: base_url = static_s3 else: -# import toml -# import re -# channel = "%s/%s/channel-rust-nightly.toml" % (static_s3, self.rust_nightly_date()) -# version_string = toml.load(urllib2.urlopen(channel))["pkg"]["rustc"]["version"] -# short_commit = re.search("\(([0-9a-f]+) ", version_string).group(1) -# commit_api = "https://api.github.com/repos/rust-lang/rust/commits/" + short_commit -# nightly_commit_hash = json.load(urllib2.urlopen(commit_api))["sha"] nightly_commit_hash = self.rust_nightly_date() base_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds" diff --git a/rust-toolchain b/rust-toolchain index e09d60425b1c..992a58de4d27 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-05e3c96d36b5281e969b5e79b92d671c7872bf83 +nightly-d7d75eff30ff03f607ff0656a50f4be768cfdbc9 From cd987758d5bd1092b133a0167cf2deab501adc75 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 12 Sep 2017 07:11:28 +0200 Subject: [PATCH 8/8] Bisect --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 992a58de4d27..bafe246ad0ce 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-d7d75eff30ff03f607ff0656a50f4be768cfdbc9 +nightly-a6a9d4c5fd214cb8110482dee2017607e23ccc7b