Skip to content

Commit 8cb5885

Browse files
CentrilCentril
authored
Rollup merge of #61284 - alexcrichton:less-s3, r=pietroalbini
Update all s3 URLs used on CI with subdomains Ensure that they're all forwards-compatible with AWS updates happening next year by ensuring the bucket name shows up in the domain name. Closes #61168
2 parents 8b55529 + 3eda151 commit 8cb5885

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

‎.azure-pipelines/auto.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
MSYS_BITS: 32
275275
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
276276
SCRIPT: make ci-subset-1
277-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
277+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
278278
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
279279
MINGW_DIR: mingw32
280280
# FIXME(#59637)
@@ -284,14 +284,14 @@ jobs:
284284
MSYS_BITS: 32
285285
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
286286
SCRIPT: make ci-subset-2
287-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
287+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
288288
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
289289
MINGW_DIR: mingw32
290290
x86_64-mingw-1:
291291
MSYS_BITS: 64
292292
SCRIPT: make ci-subset-1
293293
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
294-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
294+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
295295
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
296296
MINGW_DIR: mingw64
297297
# FIXME(#59637)
@@ -301,7 +301,7 @@ jobs:
301301
MSYS_BITS: 64
302302
SCRIPT: make ci-subset-2
303303
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
304-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
304+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
305305
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
306306
MINGW_DIR: mingw64
307307

@@ -328,7 +328,7 @@ jobs:
328328
MSYS_BITS: 32
329329
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools
330330
SCRIPT: python x.py dist
331-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
331+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
332332
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
333333
MINGW_DIR: mingw32
334334
DIST_REQUIRE_ALL_TOOLS: 1
@@ -337,7 +337,7 @@ jobs:
337337
MSYS_BITS: 64
338338
SCRIPT: python x.py dist
339339
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools
340-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
340+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
341341
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
342342
MINGW_DIR: mingw64
343343
DIST_REQUIRE_ALL_TOOLS: 1

‎.azure-pipelines/steps/install-clang.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
# Original downloaded here came from
2828
# http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe
2929
- script: |
30-
powershell -Command "iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/LLVM-7.0.0-win64.exe"
30+
powershell -Command "iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
3131
set CLANG_DIR=%CD%\citools\clang-rust
3232
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
3333
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe

‎.azure-pipelines/steps/install-sccache.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ steps:
22

33
- bash: |
44
set -e
5-
curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin
5+
curl -fo /usr/local/bin/sccache https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin
66
chmod +x /usr/local/bin/sccache
77
displayName: Install sccache (OSX)
88
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
99

1010
- script: |
1111
md sccache
12-
powershell -Command "iwr -outf sccache\sccache.exe https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
12+
powershell -Command "iwr -outf sccache\sccache.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
1313
echo ##vso[task.prependpath]%CD%\sccache
1414
displayName: Install sccache (Windows)
1515
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

‎.azure-pipelines/steps/install-windows-build-deps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ steps:
8181
# Note that this is originally from the github releases patch of Ninja
8282
- script: |
8383
md ninja
84-
powershell -Command "iwr -outf 2017-03-15-ninja-win.zip https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-15-ninja-win.zip"
84+
powershell -Command "iwr -outf 2017-03-15-ninja-win.zip https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip"
8585
7z x -oninja 2017-03-15-ninja-win.zip
8686
del 2017-03-15-ninja-win.zip
8787
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja

‎appveyor.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ environment:
5959
MSYS_BITS: 32
6060
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
6161
SCRIPT: make ci-subset-1
62-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
62+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
6363
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
6464
MINGW_DIR: mingw32
6565
# FIXME(#59637)
@@ -69,14 +69,14 @@ environment:
6969
MSYS_BITS: 32
7070
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
7171
SCRIPT: make ci-subset-2
72-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
72+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
7373
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
7474
MINGW_DIR: mingw32
7575
- CI_JOB_NAME: x86_64-mingw
7676
MSYS_BITS: 64
7777
SCRIPT: python x.py test
7878
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
79-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
79+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
8080
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
8181
MINGW_DIR: mingw64
8282
# FIXME(#59637)
@@ -106,7 +106,7 @@ environment:
106106
MSYS_BITS: 32
107107
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools --enable-profiler
108108
SCRIPT: python x.py dist
109-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
109+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
110110
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
111111
MINGW_DIR: mingw32
112112
DIST_REQUIRE_ALL_TOOLS: 1
@@ -115,7 +115,7 @@ environment:
115115
MSYS_BITS: 64
116116
SCRIPT: python x.py dist
117117
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools --enable-profiler
118-
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
118+
MINGW_URL: https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
119119
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
120120
MINGW_DIR: mingw64
121121
DIST_REQUIRE_ALL_TOOLS: 1
@@ -159,7 +159,7 @@ install:
159159
#
160160
# Original downloaded here came from
161161
# http://releases.llvm.org/8.0.0/LLVM-8.0.0-win64.exe
162-
- if NOT defined MINGW_URL appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/LLVM-8.0.0-win64.exe
162+
- if NOT defined MINGW_URL appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-8.0.0-win64.exe
163163
- if NOT defined MINGW_URL .\LLVM-8.0.0-win64.exe /S /NCRC /D=C:\clang-rust
164164
- if NOT defined MINGW_URL set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=C:\clang-rust\bin\clang-cl.exe
165165

@@ -191,25 +191,25 @@ install:
191191
- set PATH=C:\Python27;%PATH%
192192

193193
# Download and install sccache
194-
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc
194+
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc
195195
- mv 2018-04-26-sccache-x86_64-pc-windows-msvc sccache.exe
196196
- set PATH=%PATH%;%CD%
197197

198198
# Download and install ninja
199199
#
200200
# Note that this is originally from the github releases patch of Ninja
201-
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-15-ninja-win.zip
201+
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip
202202
- 7z x 2017-03-15-ninja-win.zip
203203
- set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
204204
# - set PATH=%PATH%;%CD% -- this already happens above for sccache
205205

206206
# Install InnoSetup to get `iscc` used to produce installers
207-
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-08-22-is.exe
207+
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-08-22-is.exe
208208
- 2017-08-22-is.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
209209
- set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
210210

211211
# Help debug some handle issues on AppVeyor
212-
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-15-Handle.zip
212+
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-05-15-Handle.zip
213213
- mkdir handle
214214
- 7z x -ohandle 2017-05-15-Handle.zip
215215
- set PATH=%PATH%;%CD%\handle

‎src/ci/docker/armhf-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7272

7373
# TODO: What is this?!
7474
# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
75-
RUN curl -O https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/vexpress-v2p-ca15-tc1.dtb
75+
RUN curl -O https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/vexpress-v2p-ca15-tc1.dtb
7676

7777
COPY scripts/sccache.sh /scripts/
7878
RUN sh /scripts/sccache.sh

‎src/ci/docker/dist-various-1/install-mips-musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir /usr/local/mips-linux-musl
55
# originally from
66
# https://downloads.openwrt.org/snapshots/trunk/ar71xx/generic/
77
# OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2
8-
URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror"
8+
URL="https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror"
99
FILE="OpenWrt-Toolchain-ar71xx-generic_gcc-5.3.0_musl-1.1.16.Linux-x86_64.tar.bz2"
1010
curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mips-linux-musl --strip-components=2
1111

‎src/ci/docker/dist-various-1/install-mipsel-musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir /usr/local/mipsel-linux-musl
55
# Note that this originally came from:
66
# https://downloads.openwrt.org/snapshots/trunk/malta/generic/
77
# OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
8-
URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc"
8+
URL="https://rust-lang-ci2.s3.amazonaws.com/libc"
99
FILE="OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2"
1010
curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2
1111

‎src/ci/docker/dist-various-2/build-wasi-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -ex
66

77
# Originally from https://releases.llvm.org/8.0.0/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz
8-
curl https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/clang%2Bllvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz | \
8+
curl https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/clang%2Bllvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz | \
99
tar xJf -
1010
export PATH=`pwd`/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-14.04/bin:$PATH
1111

‎src/ci/docker/dist-x86_64-linux/build-openssl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44
source shared.sh
55

66
VERSION=1.0.2k
7-
URL=https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/openssl-$VERSION.tar.gz
7+
URL=https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/openssl-$VERSION.tar.gz
88

99
curl $URL | tar xzf -
1010

‎src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cd netbsd
2525

2626
mkdir -p /x-tools/x86_64-unknown-netbsd/sysroot
2727

28-
URL=https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
28+
URL=https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror
2929

3030
# Originally from ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-$BSD/source/sets/*.tgz
3131
curl $URL/2018-03-01-netbsd-src.tgz | tar xzf -

‎src/ci/docker/scripts/emscripten.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ exit 1
1818
}
1919

2020
cd /
21-
curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
21+
curl -fL https://mozilla-games.s3.amazonaws.com/emscripten/releases/emsdk-portable.tar.gz | \
2222
tar -xz
2323

2424
cd /emsdk-portable

‎src/ci/docker/scripts/freebsd-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ done
5959

6060
# Originally downloaded from:
6161
# https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz
62-
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
62+
URL=https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2019-04-04-freebsd-${freebsd_arch}-${freebsd_version}-RELEASE-base.txz
6363
curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}"
6464

6565
# Fix up absolute symlinks from the system image. This can be removed

‎src/ci/docker/scripts/sccache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set -ex
22

33
curl -fo /usr/local/bin/sccache \
4-
https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-unknown-linux-musl
4+
https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-02-sccache-x86_64-unknown-linux-musl
55

66
chmod +x /usr/local/bin/sccache

0 commit comments

Comments
 (0)