Skip to content

Commit 89115c0

Browse files
committed
Auto merge of #48891 - alexcrichton:dist-osx-9.3, r=kennytm
travis: Upgrade dist builders for OSX This commit upgrades the dist builders for OSX to Travis's new `xcode9.3-moar` image which has 3 cores available to it instead of 2. This should help us provide speedier builds on OSX and hit timeouts less in theory! Note that historically the dist builders for OSX have been a different version than the ones that are running tests. I had forgotten why this was the case and digging around brought up 3076155 where apparently Xcode 8 wasn't able to compile LLVM with `MACOSX_DEPLOYMENT_TARGET=10.7` which we desired. On a whim I gave this PR a spin and it [looks like][green] this has since been fixed (maybe in LLVM?). In any case those green builds should hopefully mean that we can safely upgrade and get faster infrastructure to boot. This commit also includes an upgrade of OpenSSL. This is not done for security reasons but rather build system reasons. Originally builds with the new image [did not succeed][red] due to weird build failures in OpenSSL, but upgrading seems to have made the spurious errors go away to here's to also hoping that's fixed! [green]: https://travis-ci.org/rust-lang/rust/builds/351353412 [red]: https://travis-ci.org/rust-lang/rust/builds/350969248
2 parents 257ec08 + d65dfd1 commit 89115c0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ matrix:
3535
NO_LLVM_ASSERTIONS=1
3636
NO_DEBUG_ASSERTIONS=1
3737
os: osx
38-
osx_image: xcode7.3
38+
osx_image: xcode9.3-moar
3939
if: branch = auto
4040
4141
# macOS builders. These are placed near the beginning because they are very
@@ -90,7 +90,7 @@ matrix:
9090
NO_LLVM_ASSERTIONS=1
9191
NO_DEBUG_ASSERTIONS=1
9292
os: osx
93-
osx_image: xcode7.3
93+
osx_image: xcode9.3-moar
9494
if: branch = auto
9595
9696
- env: >
@@ -104,7 +104,7 @@ matrix:
104104
NO_LLVM_ASSERTIONS=1
105105
NO_DEBUG_ASSERTIONS=1
106106
os: osx
107-
osx_image: xcode7.3
107+
osx_image: xcode9.3-moar
108108
if: branch = auto
109109
110110
# Linux builders, remaining docker images

src/bootstrap/native.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,9 @@ impl Step for TestHelpers {
424424
}
425425
}
426426

427-
const OPENSSL_VERS: &'static str = "1.0.2m";
427+
const OPENSSL_VERS: &'static str = "1.0.2n";
428428
const OPENSSL_SHA256: &'static str =
429-
"8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
429+
"370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe";
430430

431431
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
432432
pub struct Openssl {

0 commit comments

Comments
 (0)