From ac8892bdb227e135ed7e5c3f8bb34b6b031a4579 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 25 Apr 2017 16:08:14 +0200 Subject: [PATCH 1/5] Accept arbitrary filenames into URLs in build-manifest instead of combining the component and target into a URL. --- src/tools/build-manifest/src/main.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index a8cb30da435..c6f6b2dbc0f 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -293,7 +293,7 @@ impl Builder { pkg.target.insert(host.to_string(), Target { available: true, - url: Some(self.url("rust", host)), + url: Some(self.url(&filename)), hash: Some(digest), components: Some(components), extensions: Some(extensions), @@ -325,7 +325,7 @@ impl Builder { (name.to_string(), Target { available: true, - url: Some(self.url(pkgname, name)), + url: Some(self.url(&filename)), hash: Some(digest), components: None, extensions: None, @@ -338,11 +338,11 @@ impl Builder { }); } - fn url(&self, component: &str, target: &str) -> String { + fn url(&self, filename: &str) -> String { format!("{}/{}/{}", self.s3_address, self.date, - self.filename(component, target)) + filename) } fn filename(&self, component: &str, target: &str) -> String { From 5439c9b4ec975083cb1bc2000a5faa21f737997a Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 25 Apr 2017 16:11:18 +0200 Subject: [PATCH 2/5] Define the unavailable target just once and re-use it The same unavailable target value is used in two different places. Abstracting it makes it easier to update it and recognise its purpose. --- src/tools/build-manifest/src/main.rs | 30 +++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index c6f6b2dbc0f..574af124636 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -120,6 +120,18 @@ struct Target { extensions: Option>, } +impl Target { + fn unavailable() -> Target { + Target { + available: false, + url: None, + hash: None, + components: None, + extensions: None, + } + } +} + #[derive(RustcEncodable)] struct Component { pkg: String, @@ -242,13 +254,7 @@ impl Builder { let digest = match self.digests.remove(&filename) { Some(digest) => digest, None => { - pkg.target.insert(host.to_string(), Target { - available: false, - url: None, - hash: None, - components: None, - extensions: None, - }); + pkg.target.insert(host.to_string(), Target::unavailable()); continue } }; @@ -312,15 +318,7 @@ impl Builder { let filename = self.filename(pkgname, name); let digest = match self.digests.remove(&filename) { Some(digest) => digest, - None => { - return (name.to_string(), Target { - available: false, - url: None, - hash: None, - components: None, - extensions: None, - }) - } + None => return (name.to_string(), Target::unavailable()), }; (name.to_string(), Target { From 5dfa08ee1be4cf6485ed6ece0c2b08be394ab8c6 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 25 Apr 2017 16:14:28 +0200 Subject: [PATCH 3/5] Emit information about XZ packages in manifest --- src/rust-installer | 2 +- src/tools/build-manifest/src/main.rs | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/rust-installer b/src/rust-installer index 4f994850808..4cf7397fb05 160000 --- a/src/rust-installer +++ b/src/rust-installer @@ -1 +1 @@ -Subproject commit 4f994850808a572e2cc8d43f968893c8e942e9bf +Subproject commit 4cf7397fb0566e745f0bce4c5b009cfeb5d12c53 diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 574af124636..ba37863b1f6 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -116,6 +116,8 @@ struct Target { available: bool, url: Option, hash: Option, + xz_url: Option, + xz_hash: Option, components: Option>, extensions: Option>, } @@ -126,6 +128,8 @@ impl Target { available: false, url: None, hash: None, + xz_url: None, + xz_hash: None, components: None, extensions: None, } @@ -258,6 +262,8 @@ impl Builder { continue } }; + let xz_filename = filename.replace(".tar.gz", ".tar.xz"); + let xz_digest = self.digests.remove(&xz_filename); let mut components = Vec::new(); let mut extensions = Vec::new(); @@ -301,6 +307,8 @@ impl Builder { available: true, url: Some(self.url(&filename)), hash: Some(digest), + xz_url: xz_digest.as_ref().map(|_| self.url(&xz_filename)), + xz_hash: xz_digest, components: Some(components), extensions: Some(extensions), }); @@ -320,11 +328,15 @@ impl Builder { Some(digest) => digest, None => return (name.to_string(), Target::unavailable()), }; + let xz_filename = filename.replace(".tar.gz", ".tar.xz"); + let xz_digest = self.digests.remove(&xz_filename); (name.to_string(), Target { available: true, url: Some(self.url(&filename)), hash: Some(digest), + xz_url: xz_digest.as_ref().map(|_| self.url(&xz_filename)), + xz_hash: xz_digest, components: None, extensions: None, }) From 5e522d73a3664bbfd0ec5a9ad4efee4165c35d37 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 2 May 2017 01:42:30 +0200 Subject: [PATCH 4/5] Fix MacOSX build MacOSX does not ship `7z` nor `xz`. Let's use `xz`, just like on the other *nix systems. --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d56379dcce..5c658f3a8b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,9 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 os: osx osx_image: xcode7 - install: *osx_install_sccache + install: + - brew update && brew install xz + - *osx_install_sccache - env: > RUST_CHECK_TARGET=dist RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended" @@ -106,7 +108,9 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 os: osx osx_image: xcode7 - install: *osx_install_sccache + install: + - brew update && brew install xz + - *osx_install_sccache # "alternate" deployments, these are "nightlies" but don't have assertions # turned on, they're deployed to a different location primarily for projects @@ -123,7 +127,9 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 os: osx osx_image: xcode7 - install: *osx_install_sccache + install: + - brew update && brew install xz + - *osx_install_sccache env: global: From 98dd82c013b04af19eeb802562c1cf99c52010c5 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Wed, 3 May 2017 22:38:41 +0200 Subject: [PATCH 5/5] Retry `brew` commands upon failure Wrap the installation on macOS with `travis_retry`. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c658f3a8b1..62e6280edd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,8 @@ matrix: os: osx osx_image: xcode7 install: - - brew update && brew install xz + - travis_retry brew update + - travis_retry brew install xz - *osx_install_sccache - env: > RUST_CHECK_TARGET=dist @@ -109,7 +110,8 @@ matrix: os: osx osx_image: xcode7 install: - - brew update && brew install xz + - travis_retry brew update + - travis_retry brew install xz - *osx_install_sccache # "alternate" deployments, these are "nightlies" but don't have assertions @@ -128,7 +130,8 @@ matrix: os: osx osx_image: xcode7 install: - - brew update && brew install xz + - travis_retry brew update + - travis_retry brew install xz - *osx_install_sccache env: