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.

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

Jump to bottom

Update Envoy #2435

Merged
merged 15 commits into from
Jul 25, 2022
Merged

Update Envoy #2435

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4766a00
Update Envoy
jpsim Jul 20, 2022
f6e6d02
WIP: deps updates
jpsim Jul 20, 2022
b9aaeb7
`strict_java_deps=off`
jpsim Jul 20, 2022
0426e4e
Bump proto deps
jpsim Jul 20, 2022
25dd25a
Bump rules_java
jpsim Jul 21, 2022
d3d0376
Switch back to bazelbuild repo
jpsim Jul 21, 2022
10c5e4b
https://github.com/bazelbuild/rules_java/pull/65
jpsim Jul 21, 2022
f550b77
https://github.com/envoyproxy/envoy/pull/22356
jpsim Jul 21, 2022
8a0c7b4
Don't pin grpc-java
jpsim Jul 21, 2022
23e9d2a
Switch back to main Envoy repo
jpsim Jul 21, 2022
4bbc735
more
jpsim Jul 21, 2022
54f241c
Merge remote-tracking branch 'origin/main' into update-envoy-1658317679
jpsim Jul 21, 2022
e89c886
Envoy
jpsim Jul 21, 2022
264546b
Reword TODO
jpsim Jul 25, 2022
5869919
Bump Envoy again
jpsim Jul 25, 2022
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
12 changes: 7 additions & 5 deletions bazel/envoy_mobile_repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ def upstream_envoy_overrides():
def swift_repos():
http_archive(
name = "build_bazel_rules_apple",
sha256 = "36072d4f3614d309d6a703da0dfe48684ec4c65a89611aeb9590b45af7a3e592",
url = "https://github.com/bazelbuild/rules_apple/releases/download/1.0.1/rules_apple.1.0.1.tar.gz",
sha256 = "d4c2f715b83b5884e1164fb0e9f3de5b053d77d4436a04510b7940274e91699e",
strip_prefix = "rules_apple-8533494fa029f0fc44009c4532c191f349acf193",
url = "https://github.com/bazelbuild/rules_apple/archive/8533494fa029f0fc44009c4532c191f349acf193.tar.gz",
)

http_archive(
Expand Down Expand Up @@ -105,9 +106,10 @@ def swift_repos():
def kotlin_repos():
http_archive(
name = "rules_java",
sha256 = "ddc9e11f4836265fea905d2845ac1d04ebad12a255f791ef7fd648d1d2215a5b",
strip_prefix = "rules_java-5.0.0",
url = "https://github.com/bazelbuild/rules_java/archive/refs/tags/5.0.0.tar.gz",
sha256 = "19462d64b1586c0d4ea0e87f9325be2514f0eb84e56dbf3245450451b3701581",
strip_prefix = "rules_java-43243982abc76390ef64be62379a1353f9011771",
# TODO(jpsim): Switch back to bazelbuild repo when https://github.com/bazelbuild/rules_java/pull/65 is merged
Copy link
Contributor

Choose a reason for hiding this comment

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

@Bencodes do you have a better idea here? Do you think it's ok to use this reverted branch for now to unblock?

Some details as to the error we're hitting in bazelbuild/rules_java#64

url = "https://github.com/jpsim/rules_java/archive/43243982abc76390ef64be62379a1353f9011771.tar.gz",
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion envoy
Open in desktop
Submodule envoy updated 226 files
2 changes: 1 addition & 1 deletion library/common/jni/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cc_library(
config_setting(
name = "android_armeabi",
constraint_values = [
"@platforms//cpu:arm",
"@platforms//cpu:armv7",
"@platforms//os:android",
],
)
Expand Down