about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-11-06 18:58:57 +0100
committerPietro Albini <pietro@pietroalbini.org>2019-11-12 11:06:11 +0100
commit85132b20c4b3f6858ea273ec276c4ad9162603f8 (patch)
treeb95fc3ae2952ef447296441d2dedd9545a14814b
parent14da85c68e6b5cd8a64a1f2f5ba5cd50c725e38b (diff)
downloadrust-85132b20c4b3f6858ea273ec276c4ad9162603f8.tar.gz
rust-85132b20c4b3f6858ea273ec276c4ad9162603f8.zip
ci: download curl and openssl from s3 for dist-x86_64-linux
CentOS 5 only supports SSLv3 without SNI, and to get newer protocols
working we need to download and compile OpenSSL and cURL from our
mirror. Because of that, we can't use the CDN, as CloudFront requires
TLSv1 with SNI.

This commit changes the dist-x86_64-linux image to bypass the CDN for
OpenSSL and cURL.
-rwxr-xr-xsrc/ci/docker/dist-x86_64-linux/build-curl.sh5
-rwxr-xr-xsrc/ci/docker/dist-x86_64-linux/build-openssl.sh6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/ci/docker/dist-x86_64-linux/build-curl.sh b/src/ci/docker/dist-x86_64-linux/build-curl.sh
index a65e3de5cfc..0c7eb5fdac9 100755
--- a/src/ci/docker/dist-x86_64-linux/build-curl.sh
+++ b/src/ci/docker/dist-x86_64-linux/build-curl.sh
@@ -5,7 +5,10 @@ source shared.sh
 
 VERSION=7.66.0
 
-curl https://ci-mirrors.rust-lang.org/rustc/curl-$VERSION.tar.xz \
+# This needs to be downloaded directly from S3, it can't go through the CDN.
+# That's because the CDN is backed by CloudFront, which requires SNI and TLSv1
+# (without paying an absurd amount of money).
+curl https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/curl-$VERSION.tar.xz \
   | xz --decompress \
   | tar xf -
 
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 0d9bdf7a099..d8f6bdb51b8 100755
--- a/src/ci/docker/dist-x86_64-linux/build-openssl.sh
+++ b/src/ci/docker/dist-x86_64-linux/build-openssl.sh
@@ -4,7 +4,11 @@ set -ex
 source shared.sh
 
 VERSION=1.0.2k
-URL=https://ci-mirrors.rust-lang.org/rustc/openssl-$VERSION.tar.gz
+
+# This needs to be downloaded directly from S3, it can't go through the CDN.
+# That's because the CDN is backed by CloudFront, which requires SNI and TLSv1
+# (without paying an absurd amount of money).
+URL=https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/openssl-$VERSION.tar.gz
 
 curl $URL | tar xzf -