Skip to content

fix conflicted #2101

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
istio-testing merged 2 commits into from
Jan 31, 2019
Merged

fix conflicted #2101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c4ea7
fix conflicted merge
quanjielin Jan 31, 2019
c151fc2
remove sha256
quanjielin Jan 31, 2019
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
4 changes: 0 additions & 4 deletions .circleci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ RUN sudo apt-get update && \
clang-6.0 clang-format-6.0 rsync ninja-build

# ~100M, depends on g++, zlib1g-dev, bash-completions
<<<<<<< HEAD
RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.15.2/bazel_0.15.2-linux-x86_64.deb && \
=======
RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel_0.18.0-linux-x86_64.deb && \
>>>>>>> upstream/release-1.1
sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb


Expand Down
4 changes: 0 additions & 4 deletions .circleci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ HUB ?=
PROJECT ?= istio

# Using same naming convention as istio/istio
<<<<<<< HEAD
VERSION ?= go1.10-bazel0.15-clang6.0
=======
VERSION ?= go1.10-bazel0.18-clang6.0
>>>>>>> upstream/release-1.1
IMG ?= ci

# Build a local image, can be used for testing with circleci command line.
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ test_tsan:

check:
@script/check-license-headers
@script/check-repositories
@script/check-style

artifacts: build
Expand Down
6 changes: 1 addition & 5 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ bind(
#
# Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
ENVOY_SHA = "b3be5713f2100ab5c40316e73ce34581245bd26a"
ENVOY_SHA256 = "79629284ae143d66b873c08883dc6382fac2e8ed45f6f3521f7e7282b6650216"
Copy link
Contributor

@lizan lizan Jan 31, 2019

Choose a reason for hiding this comment

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

Don't remove sha256 here and below? You don't need to change this file actually

Copy link
Contributor Author

@quanjielin quanjielin Jan 31, 2019

Choose a reason for hiding this comment

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

This was comment out before but I accidentally revert it in #2099, I think the reason of removing sha256 in this repo because it's only for our testing(by updating the envoy_sha with a local build like https://github.com/istio/envoy/tree/sds_request_debug).
@JimmyCYJ could give more context.

Copy link
Member

@JimmyCYJ JimmyCYJ Jan 31, 2019

Choose a reason for hiding this comment

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

This sds_api branch was used to demo and test SDS when Envoy SDS work was under review. @quanjielin is going to use this branch for debugging and testing sds integration with istio.

Copy link
Contributor

@lizan lizan Jan 31, 2019

Choose a reason for hiding this comment

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

ah ok I thought this is release branch or master.


http_archive(
name = "envoy",
strip_prefix = "envoy-" + ENVOY_SHA,
url = "https://github.com/envoyproxy/envoy/archive/" + ENVOY_SHA + ".tar.gz",
sha256 = ENVOY_SHA256,
url = "https://github.com/istio/envoy/archive/" + ENVOY_SHA + ".tar.gz",
)

load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
Expand All @@ -60,11 +58,9 @@ go_register_toolchains()

# Nov 28, 2017 (bazel 0.8.0 support)
RULES_PROTOBUF_SHA = "563b674a2ce6650d459732932ea2bc98c9c9a9bf"
RULES_PROTOBUF_SHA256 = "338e0d65cd709c6a6f9b5702466e641d536479be8b564d1e12a5d1de22a5cff6"

http_archive(
name = "org_pubref_rules_protobuf",
strip_prefix = "rules_protobuf-" + RULES_PROTOBUF_SHA,
url = "https://github.com/pubref/rules_protobuf/archive/" + RULES_PROTOBUF_SHA + ".tar.gz",
sha256 = RULES_PROTOBUF_SHA256,
)