Skip to content

build: switch protobuf version to pinned HEAD commit. #1304

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

Merged
htuch merged 1 commit into from
Jul 21, 2017
Merged

build: switch protobuf version to pinned HEAD commit. #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ci/build_container/build_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ DEPS=$(python <(cat target_recipes.bzl; \
echo "print ' '.join(\"${THIRDPARTY_DEPS}/%s.dep\" % r for r in set(TARGET_RECIPES.values()))"))

# TODO(htuch): We build twice as a workaround for https://github.com/google/protobuf/issues/3322.
# Fix this.
export THIRDPARTY_BUILD=/thirdparty_build_opt
# Fix this. This will be gone real soon now.
export THIRDPARTY_BUILD=/thirdparty_build
export CPPFLAGS="-DNDEBUG"
echo "Building opt deps ${DEPS}"
"$(dirname "$0")"/build_and_install_deps.sh ${DEPS}

ln -sf /thirdparty_build /thirdparty_build_opt

export THIRDPARTY_BUILD=/thirdparty_build_dbg
export CPPFLAGS=""
echo "Building dbg deps ${DEPS}"
Expand Down
14 changes: 9 additions & 5 deletions ci/build_container/build_recipes/protobuf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

set -e

VERSION=3.3.0
# Unless overriden with an explicit release tag, e.g. v3.2.0rc2, we use a pinned
# HEAD commit. This is only until we get a release with
# https://github.com/google/protobuf/pull/3327, i.e. v3.4.0.
[ -z "$ENVOY_PROTOBUF_COMMIT" ] && ENVOY_PROTOBUF_COMMIT=062df3d0724d9ae5e3c65d481dc1d3aca811152e # 2017-07-20

wget -O protobuf-$VERSION.tar.gz https://github.com/google/protobuf/releases/download/v$VERSION/protobuf-cpp-$VERSION.tar.gz
tar xf protobuf-$VERSION.tar.gz
rsync -av protobuf-$VERSION/* $THIRDPARTY_SRC/protobuf
cd protobuf-$VERSION
git clone https://github.com/google/protobuf.git
rsync -av protobuf/* $THIRDPARTY_SRC/protobuf
cd protobuf
git reset --hard "$ENVOY_PROTOBUF_COMMIT"
./autogen.sh
./configure --prefix=$THIRDPARTY_BUILD --enable-shared=no
make V=1 install

Expand Down