This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 28ded90 Temp workaround for boost download in FDB
28ded90 is described below
commit 28ded905fc8ce911f4165ed6a9d5f9e4d5410465
Author: Joan Touzet <woh...@apache.org>
AuthorDate: Wed May 5 17:32:25 2021 -0700
Temp workaround for boost download in FDB
---
bin/apt-dependencies.sh | 1 +
files/no-bintray.patch | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 9e53ae0..345d1c8 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -210,6 +210,7 @@ else
apt install --no-install-recommends -y cmake mono-devel ninja-build
libboost-all-dev liblz4-dev dos2unix fakeroot liblz4-1
git clone https://github.com/apple/foundationdb/
cd foundationdb && git checkout 6.3.9
+ git apply /root/couchdb-ci/files/no-bintray.patch || true
mkdir .build && cd .build
if [ "${ARCH}" == "ppc64le" ]; then
cmake -DCMAKE_CXX_FLAGS="-DNO_WARN_X86_INTRINSICS" -G Ninja ..
diff --git a/files/no-bintray.patch b/files/no-bintray.patch
new file mode 100644
index 0000000..9804fd2
--- /dev/null
+++ b/files/no-bintray.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
+index d67fe50de..d5642d642 100644
+--- a/cmake/CompileBoost.cmake
++++ b/cmake/CompileBoost.cmake
+@@ -6,7 +6,7 @@ if(Boost_FOUND)
+ else()
+ include(ExternalProject)
+ ExternalProject_add(boostProject
+- URL
"https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2";
++ URL
"https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2";
+ URL_HASH
SHA256=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
