Skip to content

Commit 5cfee9b

Browse files
alexcrichtonalexcrichton
committed
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.
1 parent fd4bef5 commit 5cfee9b

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
@@ -159,7 +159,7 @@ install:
159159
else
160160
case "$TRAVIS_OS_NAME" in
161161
linux)
162-
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 &&
162+
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 &&
163163
chmod +x $HOME/stamp &&
164164
export PATH=$PATH:$HOME
165165
;;
@@ -168,9 +168,9 @@ install:
168168
travis_retry brew update &&
169169
travis_retry brew install xz;
170170
fi &&
171-
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 &&
171+
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 &&
172172
chmod +x /usr/local/bin/sccache &&
173-
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 &&
173+
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 &&
174174
chmod +x /usr/local/bin/stamp
175175
;;
176176
esac
@@ -254,12 +254,12 @@ before_deploy:
254254
255255
deploy:
256256
- provider: s3
257-
bucket: rust-lang-ci
257+
bucket: rust-lang-ci2
258258
skip_cleanup: true
259259
local_dir: deploy
260260
upload_dir: rustc-builds
261261
acl: public_read
262-
region: us-east-1
262+
region: us-west-1
263263
access_key_id: AKIAJVBODR3IA4O72THQ
264264
secret_access_key:
265265
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -268,12 +268,12 @@ deploy:
268268
condition: $DEPLOY = 1
269269

270270
- provider: s3
271-
bucket: rust-lang-ci
271+
bucket: rust-lang-ci2
272272
skip_cleanup: true
273273
local_dir: deploy
274274
upload_dir: rustc-builds-try
275275
acl: public_read
276-
region: us-east-1
276+
region: us-west-1
277277
access_key_id: AKIAJVBODR3IA4O72THQ
278278
secret_access_key:
279279
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="
@@ -284,12 +284,12 @@ deploy:
284284
# this is the same as the above deployment provider except that it uploads to
285285
# a slightly different directory and has a different trigger
286286
- provider: s3
287-
bucket: rust-lang-ci
287+
bucket: rust-lang-ci2
288288
skip_cleanup: true
289289
local_dir: deploy
290290
upload_dir: rustc-builds-alt
291291
acl: public_read
292-
region: us-east-1
292+
region: us-west-1
293293
access_key_id: AKIAJVBODR3IA4O72THQ
294294
secret_access_key:
295295
secure: "kUGd3t7JcVWFESgIlzvsM8viZgCA9Encs3creW0xLJaLSeI1iVjlJK4h/2/nO6y224AFrh/GUfsNr4/4AlxPuYb8OU5oC5Lv+Ff2JiRDYtuNpyQSKAQp+bRYytWMtrmhja91h118Mbm90cUfcLPwkdiINgJNTXhPKg5Cqu3VYn0="

‎appveyor.yml

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

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

134134
# Download and install sccache
135-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-pc-windows-msvc
135+
- 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
136136
- mv 2017-05-12-sccache-x86_64-pc-windows-msvc sccache.exe
137137
- set PATH=%PATH%;%CD%
138138

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

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

152152
# Help debug some handle issues on AppVeyor
153-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-15-Handle.zip
153+
- appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-05-15-Handle.zip
154154
- mkdir handle
155155
- 7z x -ohandle 2017-05-15-Handle.zip
156156
- set PATH=%PATH%;%CD%\handle
@@ -188,9 +188,9 @@ deploy:
188188
access_key_id: AKIAJVBODR3IA4O72THQ
189189
secret_access_key:
190190
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
191-
bucket: rust-lang-ci
191+
bucket: rust-lang-ci2
192192
set_public: true
193-
region: us-east-1
193+
region: us-west-1
194194
artifact: /.*/
195195
folder: rustc-builds
196196
on:
@@ -205,9 +205,9 @@ deploy:
205205
access_key_id: AKIAJVBODR3IA4O72THQ
206206
secret_access_key:
207207
secure: tQWIE+DJHjXaV4np/3YeETkEmXngtIuIgAO/LYKQaUshGLgN8cBCFGG3cHx5lKLt
208-
bucket: rust-lang-ci
208+
bucket: rust-lang-ci2
209209
set_public: true
210-
region: us-east-1
210+
region: us-west-1
211211
artifact: /.*/
212212
folder: rustc-builds-alt
213213
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)