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.

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 Envoy SHA to latest with deterministic hash (master). #2108

Merged
merged 3 commits into from
Feb 12, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 6 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# Envoy specific Bazel build/test options.

build --workspace_status_command=tools/bazel_get_workspace_status
# Bazel doesn't need more than 200MB of memory based on memory profiling:
# https://docs.bazel.build/versions/master/skylark/performance.html#memory-profiling
# Limiting JVM heapsize here to let it do GC more when approaching the limit to
# leave room for compiler/linker.
startup --host_jvm_args=-Xmx512m

# Basic ASAN/UBSAN that works for gcc
build:asan --define ENVOY_CONFIG_ASAN=1
Expand All @@ -18,6 +23,7 @@ build:asan --define signal_trace=disabled
# Clang 5.0 ASAN
build:clang-asan --define ENVOY_CONFIG_ASAN=1
build:clang-asan --copt -D__SANITIZE_ADDRESS__
build:clang-asan --copt -DADDRESS_SANITIZER=1
build:clang-asan --copt -fsanitize=address,undefined
build:clang-asan --linkopt -fsanitize=address,undefined
build:clang-asan --copt -fno-sanitize=vptr
Expand Down
18 changes: 11 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ version: 2
jobs:
build:
docker:
- image: istio/ci:go1.10-bazel0.18-clang6.0
- image: istio/ci:go1.11-bazel0.22-clang7
environment:
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
- BAZEL_BUILD_ARGS: "--local_resources=12288,5,1"
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8"
resource_class: xlarge
steps:
- checkout
Expand All @@ -30,9 +31,10 @@ jobs:
destination: /proxy/bin
linux_asan:
docker:
- image: istio/ci:go1.10-bazel0.18-clang6.0
- image: istio/ci:go1.11-bazel0.22-clang7
environment:
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
- BAZEL_BUILD_ARGS: "--local_resources=12288,5,1"
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8"
resource_class: xlarge
steps:
- checkout
Expand All @@ -49,9 +51,10 @@ jobs:
- /home/circleci/.cache/bazel
linux_tsan:
docker:
- image: istio/ci:go1.10-bazel0.18-clang6.0
- image: istio/ci:go1.11-bazel0.22-clang7
environment:
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
- BAZEL_BUILD_ARGS: "--local_resources=12288,5,1"
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8"
resource_class: xlarge
steps:
- checkout
Expand All @@ -71,7 +74,8 @@ jobs:
xcode: "9.3.0"
environment:
- BAZEL_STARTUP_ARGS: "--output_base /Users/distiller/.cache/bazel"
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all"
- BAZEL_BUILD_ARGS: "--local_resources=12288,5,1"
- BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8"
- CC: clang
- CXX: clang++
steps:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ BAZEL_TEST_ARGS ?=
HUB ?=
TAG ?=
ifeq "$(origin CC)" "default"
CC := clang-6.0
CC := clang-7
endif
ifeq "$(origin CXX)" "default"
CXX := clang++-6.0
CXX := clang++-7
endif

build:
Expand Down
8 changes: 6 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ bind(
# When updating envoy sha manually please update the sha in istio.deps file also
#
# Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
ENVOY_SHA = "b3be5713f2100ab5c40316e73ce34581245bd26a"
ENVOY_SHA = "925810d00b0d3095a8e67fd4e04e0f597ed188bb"

ENVOY_SHA256 = "79629284ae143d66b873c08883dc6382fac2e8ed45f6f3521f7e7282b6650216"
ENVOY_SHA256 = "26d1f14e881455546cf0e222ec92a8e1e5f65cb2c5761d63c66598b39cd9c47d"

http_archive(
name = "envoy",
Expand All @@ -50,6 +50,10 @@ load("@envoy//bazel:repositories.bzl", "envoy_dependencies")

envoy_dependencies()

load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")

rules_foreign_cc_dependencies()

load("@envoy//bazel:cc_configure.bzl", "cc_configure")

cc_configure()
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": "b3be5713f2100ab5c40316e73ce34581245bd26a"
"lastStableSHA": "925810d00b0d3095a8e67fd4e04e0f597ed188bb"
}
]
4 changes: 2 additions & 2 deletions script/release-binary
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
set -ex

# Use clang for the release builds.
CC=${CC:-clang-6.0}
CXX=${CXX:-clang++-6.0}
CC=${CC:-clang-7}
CXX=${CXX:-clang++-7}

# The bucket name to store proxy binary
DST="gs://istio-build/proxy"
Expand Down