Skip to content

Commit 1591a8e

Browse files
committed
ci: reuse the mirrors base url from shared.sh in scripts
1 parent b3a13c0 commit 1591a8e

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

src/ci/scripts/install-awscli.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ IFS=$'\n\t'
1818

1919
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
2020

21-
MIRROR="https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2019-07-27-awscli.tar"
21+
MIRROR="${MIRRORS_BASE}/2019-07-27-awscli.tar"
2222
DEPS_DIR="/tmp/awscli-deps"
2323

2424
pip="pip"

src/ci/scripts/install-clang.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ IFS=$'\n\t'
99
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010

1111
if isMacOS; then
12-
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 -
12+
curl -f "${MIRRORS_BASE}/clang%2Bllvm-7.0.0-x86_64-apple-darwin.tar.xz" | tar xJf -
1313

1414
ciCommandSetEnv CC "$(pwd)/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang"
1515
ciCommandSetEnv CXX "$(pwd)/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++"

src/ci/scripts/install-innosetup.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ IFS=$'\n\t'
1111
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1212

1313
if isWindows; then
14-
curl.exe -o is-install.exe \
15-
https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-08-22-is.exe
14+
curl.exe -o is-install.exe "${MIRRORS_BASE}/2017-08-22-is.exe"
1615
is-install.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
1716

1817
ciCommandAddPath "C:\\Program Files (x86)\\Inno Setup 5"

src/ci/scripts/install-ninja.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
88

99
if isWindows; then
1010
mkdir ninja
11-
curl -o ninja.zip \
12-
https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/2017-03-15-ninja-win.zip
11+
curl -o ninja.zip "${MIRRORS_BASE}/2017-03-15-ninja-win.zip"
1312
7z x -oninja ninja.zip
1413
rm ninja.zip
1514
ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja"

src/ci/scripts/install-wix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IFS=$'\n\t'
88
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
99

1010
if isWindows; then
11-
curl -O https://rust-lang-ci-mirrors.s3-us-west-1.amazonaws.com/rustc/wix311-binaries.zip
11+
curl -O "${MIRRORS_BASE}/wix311-binaries.zip"
1212
mkdir -p wix/bin
1313
cd wix/bin
1414
7z x ../../wix311-binaries.zip

0 commit comments

Comments
 (0)