diff options
| -rw-r--r-- | python/servo/bootstrap.py | 2 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 4 | ||||
| -rw-r--r-- | support/android/openssl.makefile | 2 | ||||
| -rw-r--r-- | support/linux/gstreamer/gstreamer.sh | 2 | ||||
| -rwxr-xr-x | support/magicleap/openssl.sh | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index ce35adb6595..e118f0d6937 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -260,7 +260,7 @@ def windows_msvc(context, force=False): '''Bootstrapper for MSVC building on Windows.''' deps_dir = os.path.join(context.sharedir, "msvc-dependencies") - deps_url = "https://servo-deps.s3.amazonaws.com/msvc-deps/" + deps_url = "https://servo-deps-2.s3.amazonaws.com/msvc-deps/" def version(package): return packages.WINDOWS_MSVC[package] diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 9c2e7429463..7095cfbcad4 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -510,7 +510,7 @@ class MachCommands(CommandBase): # Follow these instructions to build and deploy new binaries # https://github.com/servo/libgstreamer_android_gen#build print("Downloading GStreamer dependencies") - gst_url = "https://servo-deps.s3.amazonaws.com/gstreamer/%s" % gst_lib_zip + gst_url = "https://servo-deps-2.s3.amazonaws.com/gstreamer/%s" % gst_lib_zip print(gst_url) urllib.request.urlretrieve(gst_url, gst_lib_zip) zip_ref = zipfile.ZipFile(gst_lib_zip, "r") @@ -605,7 +605,7 @@ class MachCommands(CommandBase): # GStreamer configuration env.setdefault("GSTREAMER_DIR", path.join(target_path, target, "native", "gstreamer-1.16.0")) - env.setdefault("GSTREAMER_URL", "https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-magicleap-1.16.0-20190823-104505.tgz") + env.setdefault("GSTREAMER_URL", "https://servo-deps-2.s3.amazonaws.com/gstreamer/gstreamer-magicleap-1.16.0-20190823-104505.tgz") env.setdefault("PKG_CONFIG_PATH", path.join(env["GSTREAMER_DIR"], "system", "lib64", "pkgconfig")) # Override the linker set in .cargo/config diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d1ed5271b67..7430247a2e3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -42,7 +42,7 @@ from servo.packages import WINDOWS_MSVC as msvc_deps from servo.util import host_triple BIN_SUFFIX = ".exe" if sys.platform == "win32" else "" -NIGHTLY_REPOSITORY_URL = "https://servo-builds.s3.amazonaws.com/" +NIGHTLY_REPOSITORY_URL = "https://servo-builds2.s3.amazonaws.com/" @contextlib.contextmanager diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 6ffb0eea53a..e62a742589c 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -626,7 +626,7 @@ class PackageCommands(CommandBase): aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_access_key ) - BUCKET = 'servo-builds' + BUCKET = 'servo-builds2' nightly_dir = 'nightly/{}'.format(platform) filename = nightly_filename(package, timestamp) @@ -665,7 +665,7 @@ class PackageCommands(CommandBase): aws_access_key_id=aws_access_key, aws_secret_access_key=aws_secret_access_key ) - BUCKET = 'servo-builds' + BUCKET = 'servo-builds2' nightly_dir = 'nightly/maven' dest_key_base = directory.replace("target/android/gradle/servoview/maven", nightly_dir) diff --git a/support/android/openssl.makefile b/support/android/openssl.makefile index 90dee9eda8b..5bc93e1433d 100644 --- a/support/android/openssl.makefile +++ b/support/android/openssl.makefile @@ -10,5 +10,5 @@ openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure ./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION} openssl-${OPENSSL_VERSION}/Configure: - URL=https://servo-deps.s3.amazonaws.com/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \ + URL=https://servo-deps-2.s3.amazonaws.com/android-deps/openssl-${OPENSSL_VERSION}.tar.gz; \ curl $$URL | tar xzf - diff --git a/support/linux/gstreamer/gstreamer.sh b/support/linux/gstreamer/gstreamer.sh index b3430c9f509..5f29235c675 100644 --- a/support/linux/gstreamer/gstreamer.sh +++ b/support/linux/gstreamer/gstreamer.sh @@ -6,5 +6,5 @@ set -o errexit -curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz | tar xz +curl -L https://servo-deps-2.s3.amazonaws.com/gstreamer/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz | tar xz sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc diff --git a/support/magicleap/openssl.sh b/support/magicleap/openssl.sh index 67c5974bb61..9f0ba156c88 100755 --- a/support/magicleap/openssl.sh +++ b/support/magicleap/openssl.sh @@ -25,7 +25,7 @@ fi echo "Building ${OPENSSL_DIR}/lib/libssl.so" -S3_BUCKET="https://servo-deps.s3.amazonaws.com/android-deps" +S3_BUCKET="https://servo-deps-2.s3.amazonaws.com/android-deps" S3_URL="${S3_BUCKET}/openssl-${OPENSSL_VERSION}.tar.gz" if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then |