Skip to content

build: fix go-control-plane mirror#11627

Merged
lizan merged 1 commit into
envoyproxy:masterfrom
lizan:fix_go_mirror
Jun 18, 2020
Merged

build: fix go-control-plane mirror#11627
lizan merged 1 commit into
envoyproxy:masterfrom
lizan:fix_go_mirror

Conversation

@lizan
Copy link
Copy Markdown
Member

@lizan lizan commented Jun 17, 2020

Fix go-control-plane broken by #11581, which changes the output directory layout.

Change the script to detect generated code change instead of detecting envoy/api change.

Risk Level: Med
Testing: local
Docs Changes: N/A
Release Notes: N/A

Signed-off-by: Lizan Zhou lizan@tetrate.io

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
@lizan lizan requested a review from kyessenov June 17, 2020 22:59
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.
CC @envoyproxy/api-watchers: FYI only for changes made to api/.

🐱

Caused by: #11627 was opened by lizan.

see: more, trace.

rule_dir, proto = rule.decode()[len('@envoy_api//'):].rsplit(':', 1)
input_dir = os.path.join(bazel_bin, 'external', 'envoy_api', rule_dir, 'linux_amd64_stripped',
proto + '%', IMPORT_BASE, rule_dir)
input_dir = os.path.join(bazel_bin, 'external', 'envoy_api', rule_dir, proto + '_', IMPORT_BASE,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

When I tried this locally, it could find the file in the old location. Was that some stale cache issue?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@htuch htuch self-assigned this Jun 18, 2020
@kyessenov
Copy link
Copy Markdown
Contributor

Can we merge this? The bot pushed another bad commit envoyproxy/go-control-plane@e210385.

@lizan lizan merged commit d93e7af into envoyproxy:master Jun 18, 2020
@lizan lizan deleted the fix_go_mirror branch June 18, 2020 21:53
songhu pushed a commit to songhu/envoy that referenced this pull request Jun 25, 2020
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
yashwant121 pushed a commit to yashwant121/envoy that referenced this pull request Jul 24, 2020
Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Signed-off-by: yashwant121 <yadavyashwant36@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants