Skip to content

Commit ca3d118

Browse files
borsbors
committed
Auto merge of #41071 - alexcrichton:beta-next, r=alexcrichton
[beta] Backport accepted nominations This is a backport of * #40813 * #40849 This also includes #41069 Finally, this includes a bump to beta .3. This is all current nominations except #40863, which is not passing tests yet.
2 parents 06ad8e4 + f11ad72 commit ca3d118

File tree

37 files changed

+100
-59
lines changed

37 files changed

+100
-59
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ matrix:
5656
os: osx
5757
osx_image: xcode8.2
5858
install: &osx_install_sccache >
59-
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-apple-darwin &&
59+
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-apple-darwin &&
6060
chmod +x /usr/local/bin/sccache
6161
- env: >
6262
RUST_CHECK_TARGET=check
@@ -89,7 +89,7 @@ matrix:
8989
os: osx
9090
osx_image: xcode7
9191
install: >
92-
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-apple-darwin &&
92+
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-apple-darwin &&
9393
chmod +x /usr/local/bin/sccache
9494
- env: >
9595
RUST_CHECK_TARGET=dist

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ install:
115115
- set PATH=C:\Python27;%PATH%
116116

117117
# Download and install sccache
118-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-pc-windows-msvc
119-
- mv 2017-03-24-sccache-x86_64-pc-windows-msvc sccache
118+
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-pc-windows-msvc
119+
- mv 2017-04-04-sccache-x86_64-pc-windows-msvc sccache
120120
- set PATH=%PATH%;%CD%
121121

122122
# Install InnoSetup to get `iscc` used to produce installers

‎src/bootstrap/channel.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub const CFG_RELEASE_NUM: &'static str = "1.17.0";
2828
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
2929
// Be sure to make this starts with a dot to conform to semver pre-release
3030
// versions (section 9)
31-
pub const CFG_PRERELEASE_VERSION: &'static str = ".2";
31+
pub const CFG_PRERELEASE_VERSION: &'static str = ".3";
3232

3333
pub struct GitInfo {
3434
inner: Option<Info>,

‎src/bootstrap/dist.rs‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -437,29 +437,32 @@ pub fn rust_src(build: &Build) {
437437
copy(&build.src.join(item), &dst_src.join(item));
438438
}
439439

440-
// Get cargo-vendor installed, if it isn't already.
441-
let mut has_cargo_vendor = false;
442-
let mut cmd = Command::new(&build.cargo);
443-
for line in output(cmd.arg("install").arg("--list")).lines() {
444-
has_cargo_vendor |= line.starts_with("cargo-vendor ");
445-
}
446-
if !has_cargo_vendor {
440+
// If we're building from git sources, we need to vendor a complete distribution.
441+
if build.src_is_git {
442+
// Get cargo-vendor installed, if it isn't already.
443+
let mut has_cargo_vendor = false;
444+
let mut cmd = Command::new(&build.cargo);
445+
for line in output(cmd.arg("install").arg("--list")).lines() {
446+
has_cargo_vendor |= line.starts_with("cargo-vendor ");
447+
}
448+
if !has_cargo_vendor {
449+
let mut cmd = Command::new(&build.cargo);
450+
cmd.arg("install")
451+
.arg("--force")
452+
.arg("--debug")
453+
.arg("--vers").arg(CARGO_VENDOR_VERSION)
454+
.arg("cargo-vendor")
455+
.env("RUSTC", &build.rustc);
456+
build.run(&mut cmd);
457+
}
458+
459+
// Vendor all Cargo dependencies
447460
let mut cmd = Command::new(&build.cargo);
448-
cmd.arg("install")
449-
.arg("--force")
450-
.arg("--debug")
451-
.arg("--vers").arg(CARGO_VENDOR_VERSION)
452-
.arg("cargo-vendor")
453-
.env("RUSTC", &build.rustc);
461+
cmd.arg("vendor")
462+
.current_dir(&dst_src.join("src"));
454463
build.run(&mut cmd);
455464
}
456465

457-
// Vendor all Cargo dependencies
458-
let mut cmd = Command::new(&build.cargo);
459-
cmd.arg("vendor")
460-
.current_dir(&dst_src.join("src"));
461-
build.run(&mut cmd);
462-
463466
// Create source tarball in rust-installer format
464467
let mut cmd = Command::new(SH_CMD);
465468
cmd.arg(sanitize_sh(&build.src.join("src/rust-installer/gen-installer.sh")))

‎src/bootstrap/lib.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ pub struct Build {
162162
cxx: HashMap<String, gcc::Tool>,
163163
crates: HashMap<String, Crate>,
164164
is_sudo: bool,
165+
src_is_git: bool,
165166
}
166167

167168
#[derive(Debug)]
@@ -233,6 +234,7 @@ impl Build {
233234
};
234235
let rust_info = channel::GitInfo::new(&src);
235236
let cargo_info = channel::GitInfo::new(&src.join("cargo"));
237+
let src_is_git = src.join(".git").exists();
236238

237239
Build {
238240
flags: flags,
@@ -251,6 +253,7 @@ impl Build {
251253
lldb_version: None,
252254
lldb_python_dir: None,
253255
is_sudo: is_sudo,
256+
src_is_git: src_is_git,
254257
}
255258
}
256259

@@ -307,10 +310,7 @@ impl Build {
307310
OutOfSync,
308311
}
309312

310-
if !self.config.submodules {
311-
return
312-
}
313-
if fs::metadata(self.src.join(".git")).is_err() {
313+
if !self.src_is_git || !self.config.submodules {
314314
return
315315
}
316316
let git = || {

‎src/bootstrap/sanity.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub fn check(build: &mut Build) {
6565

6666
// If we've got a git directory we're gona need git to update
6767
// submodules and learn about various other aspects.
68-
if fs::metadata(build.src.join(".git")).is_ok() {
68+
if build.src_is_git {
6969
need_cmd("git".as_ref());
7070
}
7171

‎src/ci/docker/armhf-gnu/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7474
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb
7575

7676
RUN curl -o /usr/local/bin/sccache \
77-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
77+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-unknown-linux-musl && \
7878
chmod +x /usr/local/bin/sccache
7979

8080
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/cross/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2222
pkg-config
2323

2424
RUN curl -o /usr/local/bin/sccache \
25-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
25+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-unknown-linux-musl && \
2626
chmod +x /usr/local/bin/sccache
2727

2828
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/dist-android/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
3232
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3333

3434
RUN curl -o /usr/local/bin/sccache \
35-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
35+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-unknown-linux-musl && \
3636
chmod +x /usr/local/bin/sccache
3737

3838
ENV TARGETS=arm-linux-androideabi

‎src/ci/docker/dist-arm-linux/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2828
pkg-config
2929

3030
RUN curl -o /usr/local/bin/sccache \
31-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
31+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-04-04-sccache-x86_64-unknown-linux-musl && \
3232
chmod +x /usr/local/bin/sccache
3333

3434
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

0 commit comments

Comments
 (0)