about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-05 02:32:20 +0000
committerbors <bors@rust-lang.org>2019-04-05 02:32:20 +0000
commit8e2faa004137773f01cfdd615309316e768f7e84 (patch)
treed25e44d0526dbb8033487347ea4266d6da11fe4c
parent53f2165c544cceeafb308b80ace656ed328c1dc2 (diff)
parentfcc8b8cef2090389b82e96b1d4f32f70c1195206 (diff)
downloadrust-8e2faa004137773f01cfdd615309316e768f7e84.tar.gz
rust-8e2faa004137773f01cfdd615309316e768f7e84.zip
Auto merge of #59704 - alexcrichton:fix-freebsd, r=pietroalbini
ci: Update FreeBSD tarball downloads

These appear to have disappeared from the original server, so I acquired
the contents from a different mirror and uploaded them to our S3 bucket
-rwxr-xr-xsrc/ci/docker/scripts/freebsd-toolchain.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/freebsd-toolchain.sh b/src/ci/docker/scripts/freebsd-toolchain.sh
index 04483e24925..b1ac490a878 100755
--- a/src/ci/docker/scripts/freebsd-toolchain.sh
+++ b/src/ci/docker/scripts/freebsd-toolchain.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# ignore-tidy-linelength
+
 set -eux
 
 arch=$1
@@ -55,7 +57,9 @@ for lib in c++ c_nonshared compiler_rt execinfo gcc pthread rt ssp_nonshared; do
   files_to_extract=("${files_to_extract[@]}" "./usr/lib/lib${lib}.*")
 done
 
-URL=https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz
+# Originally downloaded from:
+# https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz
+URL=https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2019-04-04-freebsd-${freebsd_arch}-${freebsd_version}-RELEASE-base.txz
 curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}"
 
 # Fix up absolute symlinks from the system image.  This can be removed