diff options
| author | bors <bors@rust-lang.org> | 2019-08-21 07:44:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-21 07:44:59 +0000 |
| commit | 641586c1a54f1b1740f8dd796d7501e34c044da2 (patch) | |
| tree | 7c972bd6329bab68063c8c7035358dd64c3c028f /src/ci/docker/scripts/android-sdk-manager.py | |
| parent | e450539c2a8d7f791268d699cbe45ab3e57d43a1 (diff) | |
| parent | 3288766db1e06bed9ef588f5eede0403704aa588 (diff) | |
Auto merge of #63771 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports Cherry-picked: * RELEASES.md: ? is one of three Kleene operators #63529 * Do not ICE when synthesizing spans falling inside unicode chars #63508 * ci: move mirrors to their standalone bucket #63485 r? @ghost
Diffstat (limited to 'src/ci/docker/scripts/android-sdk-manager.py')
| -rwxr-xr-x | src/ci/docker/scripts/android-sdk-manager.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/android-sdk-manager.py b/src/ci/docker/scripts/android-sdk-manager.py index 7c9a8b82e92..c9e2961f6eb 100755 --- a/src/ci/docker/scripts/android-sdk-manager.py +++ b/src/ci/docker/scripts/android-sdk-manager.py @@ -23,8 +23,9 @@ REPOSITORIES = [ HOST_OS = "linux" # Mirroring options -MIRROR_BUCKET = "rust-lang-ci2" -MIRROR_BASE_DIR = "rust-ci-mirror/android/" +MIRROR_BUCKET = "rust-lang-ci-mirrors" +MIRROR_BUCKET_REGION = "us-west-1" +MIRROR_BASE_DIR = "rustc/android/" import argparse import hashlib @@ -144,7 +145,8 @@ def cli_install(args): lockfile = Lockfile(args.lockfile) for package in lockfile.packages.values(): # Download the file from the mirror into a temp file - url = "https://" + MIRROR_BUCKET + ".s3.amazonaws.com/" + MIRROR_BASE_DIR + url = "https://" + MIRROR_BUCKET + ".s3-" + MIRROR_BUCKET_REGION + \ + ".amazonaws.com/" + MIRROR_BASE_DIR downloaded = package.download(url) # Extract the file in a temporary directory extract_dir = tempfile.mkdtemp() |