From 1591a8eca9777900f93f9697b842bc0e6998be88 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 9 Oct 2019 15:43:30 +0200 Subject: [PATCH] ci: reuse the mirrors base url from shared.sh in scripts --- src/ci/scripts/install-awscli.sh | 2 +- src/ci/scripts/install-clang.sh | 2 +- src/ci/scripts/install-innosetup.sh | 3 +-- src/ci/scripts/install-ninja.sh | 3 +-- src/ci/scripts/install-wix.sh | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/ci/scripts/install-awscli.sh b/src/ci/scripts/install-awscli.sh index f104310430290..e21187938504c 100755 --- a/src/ci/scripts/install-awscli.sh +++ b/src/ci/scripts/install-awscli.sh @@ -18,7 +18,7 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" -MIRROR="https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2019-07-27-awscli.tar" +MIRROR="${MIRRORS_BASE}/2019-07-27-awscli.tar" DEPS_DIR="/tmp/awscli-deps" pip="pip" diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 13740e7ba5a70..ccb6a0bd9dc16 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -9,7 +9,7 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isMacOS; then - curl -f https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/clang%2Bllvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - + curl -f "${MIRRORS_BASE}/clang%2Bllvm-7.0.0-x86_64-apple-darwin.tar.xz" | tar xJf - ciCommandSetEnv CC "$(pwd)/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang" ciCommandSetEnv CXX "$(pwd)/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++" diff --git a/src/ci/scripts/install-innosetup.sh b/src/ci/scripts/install-innosetup.sh index 4ad5f24240288..ff1a9954ee6e3 100755 --- a/src/ci/scripts/install-innosetup.sh +++ b/src/ci/scripts/install-innosetup.sh @@ -11,8 +11,7 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - curl.exe -o is-install.exe \ - https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-08-22-is.exe + curl.exe -o is-install.exe "${MIRRORS_BASE}/2017-08-22-is.exe" is-install.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- ciCommandAddPath "C:\\Program Files (x86)\\Inno Setup 5" diff --git a/src/ci/scripts/install-ninja.sh b/src/ci/scripts/install-ninja.sh index f5ab17edb71bb..b8261d8a6f284 100755 --- a/src/ci/scripts/install-ninja.sh +++ b/src/ci/scripts/install-ninja.sh @@ -8,8 +8,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then mkdir ninja - curl -o ninja.zip \ - https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-03-15-ninja-win.zip + curl -o ninja.zip "${MIRRORS_BASE}/2017-03-15-ninja-win.zip" 7z x -oninja ninja.zip rm ninja.zip ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja" diff --git a/src/ci/scripts/install-wix.sh b/src/ci/scripts/install-wix.sh index b0b22b347e0d5..950e19ff6407c 100755 --- a/src/ci/scripts/install-wix.sh +++ b/src/ci/scripts/install-wix.sh @@ -8,7 +8,7 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - curl -O https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/wix311-binaries.zip + curl -O "${MIRRORS_BASE}/wix311-binaries.zip" mkdir -p wix/bin cd wix/bin 7z x ../../wix311-binaries.zip