Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI dependencies #165

Merged
merged 4 commits into from
Oct 20, 2016
+17 −17
Merged

Update CI dependencies #165

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19b1920
Update spdlog, nghttp2, openssl
Oct 20, 2016
20715c1
Update comments
Oct 20, 2016
0ebfb8d
Update requirements docs
Oct 20, 2016
7c4a0de
Update from Matt's comment
Oct 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ci/build_container/build_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export CC=gcc-4.9
export CXX=g++-4.9

# openssl
wget https://www.openssl.org/source/openssl-1.0.2h.tar.gz
tar xf openssl-1.0.2h.tar.gz
cd openssl-1.0.2h
wget https://www.openssl.org/source/openssl-1.0.2i.tar.gz
tar xf openssl-1.0.2i.tar.gz
cd openssl-1.0.2i
./config --prefix=$THIRDPARTY_BUILD -DPURIFY no-shared
make install
cd ..
Expand Down Expand Up @@ -64,9 +64,9 @@ cd ..
rm -fr jansson*

# nghttp2
wget https://github.com/nghttp2/nghttp2/releases/download/v1.14.0/nghttp2-1.14.0.tar.gz
tar xf nghttp2-1.14.0.tar.gz
cd nghttp2-1.14.0
wget https://github.com/nghttp2/nghttp2/releases/download/v1.14.1/nghttp2-1.14.1.tar.gz
tar xf nghttp2-1.14.1.tar.gz
cd nghttp2-1.14.1
./configure --prefix=$THIRDPARTY_BUILD --enable-shared=no --enable-lib-only
make install
cd ..
Expand All @@ -86,11 +86,11 @@ wget https://github.com/sakra/cotire/archive/cotire-1.7.8.tar.gz
tar xf cotire-1.7.8.tar.gz
rm cotire-1.7.8.tar.gz

# spdlog (not tag based)
git clone https://github.com/gabime/spdlog.git
cd spdlog
git reset --hard 319a62
cd ..
# spdlog
wget https://github.com/gabime/spdlog/archive/v0.11.0.tar.gz
tar xf v0.11.0.tar.gz
rm v0.11.0.tar.gz
mv spdlog-0.11.0 spdlog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's leave as spdlog-0.11.0 and update do_ci.sh to point to this directory.

Copy link
Member Author

@junr03 junr03 Oct 20, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed


# http-parser
wget -O http-parser-v2.7.0.tar.gz https://github.com/nodejs/http-parser/archive/v2.7.0.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions thirdparty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
set(ENVOY_COTIRE_MODULE_DIR "" CACHE FILEPATH "location of cotire cmake module")

# https://github.com/gabime/spdlog
# Has no releases. Last tested with 319a62
# Last tested with 0.11.0
set(ENVOY_SPDLOG_INCLUDE_DIR "" CACHE FILEPATH "location of spdlog includes")

# https://github.com/nodejs/http-parser
# Last tested with 2.7.0
set(ENVOY_HTTP_PARSER_INCLUDE_DIR "" CACHE FILEPATH "location of http-parser includes")

# https://github.com/nghttp2/nghttp2
# Last tested with 1.14.0
# Last tested with 1.14.1
set(ENVOY_NGHTTP2_INCLUDE_DIR "" CACHE FILEPATH "location of nghttp2 includes")

# http://libevent.org/
Expand All @@ -35,7 +35,7 @@ set(ENVOY_GPERFTOOLS_INCLUDE_DIR "" CACHE FILEPATH "location of gperftools inclu
set(ENVOY_JANSSON_INCLUDE_DIR "" CACHE FILEPATH "location of jansson includes")

# https://www.openssl.org/
# Last tested with 1.0.2h
# Last tested with 1.0.2i
set(ENVOY_OPENSSL_INCLUDE_DIR "" CACHE FILEPATH "location of openssl includes")

# https://github.com/google/protobuf
Expand Down