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

Fixes to build proxy #141

Merged
merged 7 commits into from Mar 19, 2022
Merged

Conversation

jwendell
Copy link
Member

No description provided.

We don't use it. It saves ~500MB on disk / ~50MB on tarball.

Cherry-pick of f635b86
jwendell and others added 4 commits March 18, 2022 15:17
We now rely on emsdk package from the host
Signed-off-by: giantcroc <changran.wang@intel.com>
@jwendell
Copy link
Member Author

/retest

Copy link
Contributor

@oschaaf oschaaf left a comment

Choose a reason for hiding this comment

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

This is awesome, and LGTM overall.
I left some comments/nits/asks; I will leave it up to you to decide if you want to follow up, and if so, if you want to do this in this PR or mop them up via a follow up.
Approving, but I added a label to keep it on hold to give you an opportunity to make a decision with respect to the review comments I left.

@@ -29,3 +29,8 @@ new_local_repository(
build_file = "openssl.BUILD",
path = "/usr/lib64/",
)
new_local_repository(
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: add newline (though perhaps we should start using Envoy's fix-format tool and enforce that in CI?).

Copy link
Member Author

Choose a reason for hiding this comment

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

+1 for enforcing this in CI.

@@ -11,7 +11,7 @@ load("@proxy_wasm_rust_sdk//bazel:dependencies.bzl", "proxy_wasm_rust_sdk_depend
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")

# go version for rules_go
GO_VERSION = "1.15.5"
GO_VERSION = "host"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add a one line doc comment to explain the rationale for this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is a port from https://github.com/maistra/proxy/blob/maistra-2.1/maistra/scripts/update-deps.sh#L97 - I removed that patch from proxy in 2.2.
We use the host's golang (as we use java, gcc, etc from the host)

@@ -253,106 +253,6 @@ envoy_cmake(
}),
)

envoy_cmake(
Copy link
Contributor

Choose a reason for hiding this comment

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

perhaps a one line comment about why we don't need this would be helpful?

Also - I wonder - can we figure out a way to minimize this change? E.g. for windows this has tags = ["skip_on_windows"], maybe we would benefit from something similar. In that case this change would fold to a single line + a comment on why we do that. This might make life easier when cutting a branch for a major new release (when we need to rebase/merge)? Just some thoughts.

Copy link
Member Author

Choose a reason for hiding this comment

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

This - and other changes in this PR - got lost in the rebase. We did that in previous versions. The reason I did that this way back in 2.1 or 2.0? Lack of knowledge in Bazel. I'd love to simplify things where it's possible. Let's do this in a follow up though.

@maistra-bot maistra-bot merged commit a79d988 into maistra:maistra-2.2 Mar 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants