Skip to content

Commit 80d7e76

Browse files
TimNNTimNN
authored
Rollup merge of rust-lang#44617 - alexcrichton:download-from-us-west-1, r=aidanhs
ci: Upload/download from a new S3 bucket Moving buckets from us-east-1 to us-west-1 because us-west-1 is where rust-central-station itself runs and in general is where we have all our other buckets.
2 parents fbee41b + 5cfee9b commit 80d7e76

File tree

9 files changed

+30
-28
lines changed

9 files changed

+30
-28
lines changed

‎.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ before_install:
193193
install:
194194
- case "$TRAVIS_OS_NAME" in
195195
linux)
196-
travis_retry curl -fo $HOME/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl &&
196+
travis_retry curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl &&
197197
chmod +x $HOME/stamp &&
198198
export PATH=$PATH:$HOME
199199
;;
@@ -202,9 +202,9 @@ install:
202202
travis_retry brew update &&
203203
travis_retry brew install xz;
204204
fi &&
205-
travis_retry curl -fo /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
205+
travis_retry curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-apple-darwin &&
206206
chmod +x /usr/local/bin/sccache &&
207-
travis_retry curl -fo /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
207+
travis_retry curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
208208
chmod +x /usr/local/bin/stamp
209209
;;
210210
esac
@@ -287,12 +287,12 @@ before_deploy:
287287
288288
deploy:
289289
- provider: s3
290-
bucket: rust-lang-ci
290+
bucket: rust-lang-ci2
291291
skip_cleanup: true
292292
local_dir: deploy
293293
upload_dir: rustc-builds
294294
acl: public_read
295-
region: us-east-1
295+
region: us-west-1
296296
access_key_id: AKIAJVBODR3IA4O72THQ
297297
secret_access_key:
298298
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -301,12 +301,12 @@ deploy:
301301
condition: $DEPLOY = 1
302302

303303
- provider: s3
304-
bucket: rust-lang-ci
304+
bucket: rust-lang-ci2
305305
skip_cleanup: true
306306
local_dir: deploy
307307
upload_dir: rustc-builds-try
308308
acl: public_read
309-
region: us-east-1
309+
region: us-west-1
310310
access_key_id: AKIAJVBODR3IA4O72THQ
311311
secret_access_key:
312312
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -317,12 +317,12 @@ deploy:
317317
# this is the same as the above deployment provider except that it uploads to
318318
# a slightly different directory and has a different trigger
319319
- provider: s3
320-
bucket: rust-lang-ci
320+
bucket: rust-lang-ci2
321321
skip_cleanup: true
322322
local_dir: deploy
323323
upload_dir: rustc-builds-alt
324324
acl: public_read
325-
region: us-east-1
325+
region: us-west-1
326326
access_key_id: AKIAJVBODR3IA4O72THQ
327327
secret_access_key:
328328
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="

‎appveyor.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ environment:
4141
- MSYS_BITS: 32
4242
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
4343
SCRIPT: python x.py test
44-
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
44+
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
4545
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
4646
MINGW_DIR: mingw32
4747
- MSYS_BITS: 64
4848
SCRIPT: python x.py test
4949
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
50-
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
50+
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
5151
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
5252
MINGW_DIR: mingw64
5353

@@ -68,14 +68,14 @@ environment:
6868
- MSYS_BITS: 32
6969
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-extended
7070
SCRIPT: python x.py dist
71-
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
71+
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
7272
MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z
7373
MINGW_DIR: mingw32
7474
DEPLOY: 1
7575
- MSYS_BITS: 64
7676
SCRIPT: python x.py dist
7777
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-extended
78-
MINGW_URL: https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
78+
MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror
7979
MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z
8080
MINGW_DIR: mingw64
8181
DEPLOY: 1
@@ -133,25 +133,25 @@ install:
133133
- set PATH=C:\Python27;%PATH%
134134

135135
# Download and install sccache
136-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
136+
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
137137
- mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
138138
- set PATH=%PATH%;%CD%
139139

140140
# Download and install ninja
141141
#
142142
# Note that this is originally from the github releases patch of Ninja
143-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-15-ninja-win.zip
143+
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-15-ninja-win.zip
144144
- 7z x 2017-03-15-ninja-win.zip
145145
- set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
146146
# - set PATH=%PATH%;%CD% -- this already happens above for sccache
147147

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

153153
# Help debug some handle issues on AppVeyor
154-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-15-Handle.zip
154+
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-15-Handle.zip
155155
- mkdir handle
156156
- 7z x -ohandle 2017-05-15-Handle.zip
157157
- set PATH=%PATH%;%CD%\handle
@@ -189,9 +189,9 @@ deploy:
189189
access_key_id: AKIAJVBODR3IA4O72THQ
190190
secret_access_key:
191191
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
192-
bucket: rust-lang-ci
192+
bucket: rust-lang-ci2
193193
set_public: true
194-
region: us-east-1
194+
region: us-west-1
195195
artifact: /.*/
196196
folder: rustc-builds
197197
on:
@@ -206,9 +206,9 @@ deploy:
206206
access_key_id: AKIAJVBODR3IA4O72THQ
207207
secret_access_key:
208208
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
209-
bucket: rust-lang-ci
209+
bucket: rust-lang-ci2
210210
set_public: true
211-
region: us-east-1
211+
region: us-west-1
212212
artifact: /.*/
213213
folder: rustc-builds-alt
214214
on:

‎src/bootstrap/native.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ impl Step for Openssl {
350350
if !tarball.exists() {
351351
let tmp = tarball.with_extension("tmp");
352352
// originally from https://www.openssl.org/source/...
353-
let url = format!("https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/{}",
353+
let url = format!("https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/{}",
354354
name);
355355
let mut ok = false;
356356
for _ in 0..3 {

‎src/ci/docker/cross/install-mips-musl.sh

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

‎src/ci/docker/cross/install-mipsel-musl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mkdir /usr/local/mipsel-linux-musl
1515
# Note that this originally came from:
1616
# https://downloads.openwrt.org/snapshots/trunk/malta/generic/
1717
# OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
18-
URL="https://s3.amazonaws.com/rust-lang-ci/libc"
18+
URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc"
1919
FILE="OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2"
2020
curl -L "$URL/$FILE" | tar xjf - -C /usr/local/mipsel-linux-musl --strip-components=2
2121

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -ex
1313
source shared.sh
1414

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

1818
curl $URL | tar xzf -
1919

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -ex
1313
source shared.sh
1414

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

1818
curl $URL | tar xzf -
1919

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cd netbsd
3535

3636
mkdir -p /x-tools/x86_64-unknown-netbsd/sysroot
3737

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

4040
# Originally from ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-$BSD/source/sets/*.tgz
4141
curl $URL/2017-03-17-netbsd-src.tgz | tar xzf -

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
# option. This file may not be copied, modified, or distributed
99
# except according to those terms.
1010

11+
# ignore-tidy-linelength
12+
1113
set -ex
1214

1315
curl -fo /usr/local/bin/sccache \
14-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
16+
https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
1517

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

0 commit comments

Comments
 (0)