Skip to content

Commit d7b6149

Browse files
committed
Use an Amazon S3 bucket for downloading deps (facebook#6526)
Summary: After we had a lot of failures with maven.org downloads, we wanted an alternative location for downloading binary dependencies. Hosting them through github would have been good in terms of organizational and network dependencies, but that approach seems to be awkward (fake releases, so would need a 'rocksdb-deps' repo) and strangely complicated for Facebook policy on open source repositories. This commit moves the downloads (that are not officially hosted by others on github) from my personal rocksdb fork to an S3 bucket owned by the Facebook RocksDB AWS account. Facebook employees can access this through an internal tool, and we should be able to grant permission to outside collaborators. Assuming this works out, I will back-port to older branches to stabilize their CI testing as well. Pull Request resolved: facebook#6526 Test Plan: CI Differential Revision: D20430130 Pulled By: pdillinger fbshipit-source-id: df52394a65e0a57942db3039bdaade8a4d520cb2
1 parent 6731fef commit d7b6149

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ install:
8181
sudo apt-get install -y mingw-w64 ;
8282
fi
8383
- if [[ "${JOB_NAME}" == cmake* ]] && [ "${TRAVIS_OS_NAME}" == linux ]; then
84-
mkdir cmake-dist && curl --silent --fail --show-error --location https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.tar.gz | tar --strip-components=1 -C cmake-dist -xz && export PATH=$PWD/cmake-dist/bin:$PATH;
84+
CMAKE_DIST_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/cmake-3.14.5-Linux-$(uname -m).tar.bz2";
85+
TAR_OPT="--strip-components=1 -xj";
86+
mkdir cmake-dist && curl --silent --fail --show-error --location "${CMAKE_DIST_URL}" | tar -C cmake-dist ${TAR_OPT} && export PATH=$PWD/cmake-dist/bin:$PATH;
8587
fi
8688
- if [[ "${JOB_NAME}" == java_test ]]; then
8789
java -version && echo "JAVA_HOME=${JAVA_HOME}";

java/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,9 @@ endif()
316316
if (DEFINED CUSTOM_DEPS_URL)
317317
set(DEPS_URL ${CUSTOM_DEPS_URL}/)
318318
else ()
319-
# This is a URL for artifacts from a "fake" release on pdillinger's fork,
320-
# so as not to put binaries in git (ew). We should move to hosting these
321-
# under the facebook account on github, or something else more reliable
322-
# than maven.org, which has been failing frequently from Travis.
323-
set(DEPS_URL "https://github.com/pdillinger/rocksdb/releases/download/v6.6.x-java-deps")
319+
# Using a Facebook AWS account for S3 storage. (maven.org has a history
320+
# of failing in Travis builds.)
321+
set(DEPS_URL "https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars")
324322
endif()
325323

326324
if(NOT EXISTS ${JAVA_JUNIT_JAR})

java/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,9 @@ ifneq ($(DEBUG_LEVEL),0)
217217
JAVAC_ARGS = -Xlint:deprecation -Xlint:unchecked
218218
endif
219219

220-
# This is a URL for artifacts from a "fake" release on pdillinger's fork,
221-
# so as not to put binaries in git (ew). We should move to hosting these
222-
# under the facebook account on github, or something else more reliable
223-
# than maven.org, which has been failing frequently from Travis.
224-
DEPS_URL?=https://github.com/pdillinger/rocksdb/releases/download/v6.6.x-java-deps
220+
# Using a Facebook AWS account for S3 storage. (maven.org has a history
221+
# of failing in Travis builds.)
222+
DEPS_URL?=https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars
225223

226224
clean: clean-not-downloaded clean-downloaded
227225

0 commit comments

Comments
 (0)