diff options
| author | bors <bors@rust-lang.org> | 2017-05-25 19:48:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-25 19:48:14 +0000 |
| commit | 5f39668642e445fedcf477493f206905dc51c2c8 (patch) | |
| tree | 55d1dd6980ea620438f6cd3ea0b5379c7eda408d | |
| parent | deb90c33ccee849821de5f3a8e26d8d9a2e774e5 (diff) | |
| parent | 357133b362c5395a503621923e4f2fd6d00c8451 (diff) | |
| download | rust-5f39668642e445fedcf477493f206905dc51c2c8.tar.gz rust-5f39668642e445fedcf477493f206905dc51c2c8.zip | |
Auto merge of #42220 - alexcrichton:update, r=brson
Update OpenSSL download location In rustbuild itself we download from our mirror but in the containers we don't do this yet. The OpenSSL download url changes from time to time (it breaks when they release a new version) so let's download from our mirror instead.
| -rwxr-xr-x | src/ci/docker/dist-i686-linux/build-openssl.sh | 5 | ||||
| -rwxr-xr-x | src/ci/docker/dist-x86_64-linux/build-openssl.sh | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ci/docker/dist-i686-linux/build-openssl.sh b/src/ci/docker/dist-i686-linux/build-openssl.sh index 64b1abf82a8..27cd064f901 100755 --- a/src/ci/docker/dist-i686-linux/build-openssl.sh +++ b/src/ci/docker/dist-i686-linux/build-openssl.sh @@ -12,9 +12,10 @@ set -ex source shared.sh -VERSION=1.0.2j +VERSION=1.0.2k +URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-$VERSION.tar.gz -curl https://www.openssl.org/source/openssl-$VERSION.tar.gz | tar xzf - +curl $URL | tar xzf - cd openssl-$VERSION hide_output ./config --prefix=/rustroot shared -fPIC diff --git a/src/ci/docker/dist-x86_64-linux/build-openssl.sh b/src/ci/docker/dist-x86_64-linux/build-openssl.sh index 64b1abf82a8..27cd064f901 100755 --- a/src/ci/docker/dist-x86_64-linux/build-openssl.sh +++ b/src/ci/docker/dist-x86_64-linux/build-openssl.sh @@ -12,9 +12,10 @@ set -ex source shared.sh -VERSION=1.0.2j +VERSION=1.0.2k +URL=https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/openssl-$VERSION.tar.gz -curl https://www.openssl.org/source/openssl-$VERSION.tar.gz | tar xzf - +curl $URL | tar xzf - cd openssl-$VERSION hide_output ./config --prefix=/rustroot shared -fPIC |