Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN sudo apt-get update && \
sudo apt-get -y install \
wget software-properties-common make cmake python python-pip pkg-config \
zlib1g-dev bash-completion bc libtool automake zip time g++-6 gcc-6 \
clang-5.0 rsync
clang-5.0 rsync ninja-build

# ~100M, depends on g++, zlib1g-dev, bash-completions
RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.11.0/bazel_0.11.0-linux-x86_64.deb && \
Expand Down
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
resource_class: xlarge
steps:
- run: sudo apt-get update && sudo apt-get install -y pkg-config
- run: curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel_0.15.2-linux-x86_64.deb && sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb
- run: sudo apt-get update && sudo apt-get install -y ninja-build pkg-config
- checkout
- restore_cache:
keys:
Expand Down Expand Up @@ -45,7 +46,7 @@ jobs:
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
steps:
- run: sudo ntpdate -vu time.apple.com
- run: brew install automake bazel cmake coreutils go libtool wget
- run: brew install automake bazel cmake coreutils go libtool ninja wget
- checkout
- restore_cache:
keys:
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bind(
)

# When updating envoy sha manually please update the sha in istio.deps file also
ENVOY_SHA = "1aa2430f3bf49557e20edf4f4ad8c2c1072e4b8f"
ENVOY_SHA = "280baee6dc45e48a4bf38ac03d32711fe5eaeee1"

http_archive(
name = "envoy",
Expand Down
2 changes: 1 addition & 1 deletion istio.deps
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "1aa2430f3bf49557e20edf4f4ad8c2c1072e4b8f"
"lastStableSHA": "280baee6dc45e48a4bf38ac03d32711fe5eaeee1"
}
]