Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 11:03:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use new S3 buckets

Browse source 
CC https://github.com/servo/project/issues/25
This commit is contained in:
Simon Sapin 2020-11-11 18:05:02 +01:00
parent 5488790be6
commit 68b5657575
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/bootstrap.py
View file

@ -260,7 +260,7 @@ def windows_msvc(context, force=False):
'''Bootstrapper for MSVC building on Windows.''' '''Bootstrapper for MSVC building on Windows.'''
deps_dir = os.path.join(context.sharedir, "msvc-dependencies") 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): def version(package):
return packages.WINDOWS_MSVC[package] return packages.WINDOWS_MSVC[package]

4
python/servo/build_commands.py
View file

@ -510,7 +510,7 @@ class MachCommands(CommandBase):
# Follow these instructions to build and deploy new binaries # Follow these instructions to build and deploy new binaries
# https://github.com/servo/libgstreamer_android_gen#build # https://github.com/servo/libgstreamer_android_gen#build
print("Downloading GStreamer dependencies") 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) print(gst_url)
urllib.request.urlretrieve(gst_url, gst_lib_zip) urllib.request.urlretrieve(gst_url, gst_lib_zip)
zip_ref = zipfile.ZipFile(gst_lib_zip, "r") zip_ref = zipfile.ZipFile(gst_lib_zip, "r")
@ -605,7 +605,7 @@ class MachCommands(CommandBase):
# GStreamer configuration # GStreamer configuration
env.setdefault("GSTREAMER_DIR", path.join(target_path, target, "native", "gstreamer-1.16.0")) 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")) env.setdefault("PKG_CONFIG_PATH", path.join(env["GSTREAMER_DIR"], "system", "lib64", "pkgconfig"))
# Override the linker set in .cargo/config # Override the linker set in .cargo/config

2
python/servo/command_base.py
View file

@ -42,7 +42,7 @@ from servo.packages import WINDOWS_MSVC as msvc_deps
from servo.util import host_triple from servo.util import host_triple
BIN_SUFFIX = ".exe" if sys.platform == "win32" else "" 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 @contextlib.contextmanager

4
python/servo/package_commands.py
View file

@ -626,7 +626,7 @@ class PackageCommands(CommandBase):
aws_access_key_id=aws_access_key, aws_access_key_id=aws_access_key,
aws_secret_access_key=aws_secret_access_key aws_secret_access_key=aws_secret_access_key
) )
BUCKET = 'servo-builds' BUCKET = 'servo-builds2'
nightly_dir = 'nightly/{}'.format(platform) nightly_dir = 'nightly/{}'.format(platform)
filename = nightly_filename(package, timestamp) filename = nightly_filename(package, timestamp)
@ -665,7 +665,7 @@ class PackageCommands(CommandBase):
aws_access_key_id=aws_access_key, aws_access_key_id=aws_access_key,
aws_secret_access_key=aws_secret_access_key aws_secret_access_key=aws_secret_access_key
) )
BUCKET = 'servo-builds' BUCKET = 'servo-builds2'
nightly_dir = 'nightly/maven' nightly_dir = 'nightly/maven'
dest_key_base = directory.replace("target/android/gradle/servoview/maven", nightly_dir) dest_key_base = directory.replace("target/android/gradle/servoview/maven", nightly_dir)

2
support/android/openssl.makefile
View file

@ -10,5 +10,5 @@ openssl-${OPENSSL_VERSION}/libssl.so: openssl-${OPENSSL_VERSION}/Configure
./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION} ./openssl.sh ${ANDROID_NDK} ${OPENSSL_VERSION}
openssl-${OPENSSL_VERSION}/Configure: 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 - curl $$URL | tar xzf -

2
support/linux/gstreamer/gstreamer.sh
View file

@ -6,5 +6,5 @@
set -o errexit 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 sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc

2
support/magicleap/openssl.sh
View file

@ -25,7 +25,7 @@ fi
echo "Building ${OPENSSL_DIR}/lib/libssl.so" 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" S3_URL="${S3_BUCKET}/openssl-${OPENSSL_VERSION}.tar.gz"
if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then if [[ ! -d "${OPENSSL_DIR}/src/openssl-${OPENSSL_VERSION}" ]]; then