Skip to content

update istio/tools #815

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
merged 3 commits into from
Feb 25, 2019
Merged

update istio/tools #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b7f9b6
update istio/tools
Feb 25, 2019
e952b50
fixes
Feb 25, 2019
c0bc2d7
fix
Feb 25, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
defaults: &defaults
working_directory: /src/istio.io/api
docker:
- image: gcr.io/istio-testing/api-build-tools:2018-10-31
- image: gcr.io/istio-testing/api-build-tools:2019-02-25
environment:
GOPATH: /go
OUT_PATH: /src
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ out_path = $(OUT_PATH)
docker_lock = protolock
docker_tool = prototool
else
gen_img := gcr.io/istio-testing/protoc:2018-06-12
gen_img := gcr.io/istio-testing/protoc:2019-02-25
lock_img := gcr.io/istio-testing/protolock:2018-10-23
all_img := gcr.io/istio-testing/api-build-tools:2018-10-31
all_img := gcr.io/istio-testing/api-build-tools:2019-02-25
pwd := $(shell pwd)
mount_dir := /src
repo_dir := istio.io/api
Expand Down Expand Up @@ -328,10 +328,10 @@ envoy_pb_pythons := $(envoy_protos:.proto=_pb2.py)
generate-envoy-go: $(envoy_pb_gos) $(envoy_pb_doc)

# Envoy APIs is internal APIs, documents is not required.
$(envoy_pb_gos): $(envoy_protos)
$(envoy_pb_gos): %.pb.go : %.proto
## Generate envoy/*/*.pb.go
@$(docker_lock) status
@$(docker_gen) $(gogofast_plugin) $^
@$(docker_gen) $(gogofast_plugin) $<

generate-envoy-python: $(envoy_pb_pythons)

Expand Down
Loading