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

Migrate to Bazel 5.0.0 #2034

Merged
merged 24 commits into from
Feb 4, 2022
Merged

Migrate to Bazel 5.0.0 #2034

merged 24 commits into from
Feb 4, 2022

Conversation

jpsim
Copy link
Contributor

@jpsim jpsim commented Feb 2, 2022

jpsim added 22 commits January 27, 2022 14:48
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
* main:
  [json] Remove com_github_nlohmann_json override & patch (envoyproxy#2030)
  Enable the "received byte count" feature. (envoyproxy#2004)

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
by changing the URL for the zip archive

Signed-off-by: JP Simard <jp@jpsim.com>
Last commit before moving to Bazel 5.0.0

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Following the instructions in https://github.com/bazelbuild/bazel-toolchains

Specifically:

    $ ./rbe_configs_gen \
            --bazel_version="5.0.0" \
            --toolchain_container="docker.io/envoyproxy/envoy-build-ubuntu:514e2f7bc36c1f0495a523b16aab9168a4aa13b6" \
            --exec_os="linux" \
            --target_os="linux" \
            --output_src_root="/path/to/envoy-mobile" \
            --output_config_path="third_party/rbe_configs" \
            --cpp_env_json=clang.json \
            --generate_java_configs=False
    $ cat clang.json
    {"CC": "/opt/llvm/bin/clang", "CXX": "/opt/llvm/bin/clang++"}

Signed-off-by: JP Simard <jp@jpsim.com>
* origin/main:
  [OWNERS] Update Envoy Mobile owners (envoyproxy#2031)
  [deps] Update rules_android to a stable release URL (envoyproxy#2032)

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
* main:
  envoy: 71248e512 (envoyproxy#2027)
  Migrate EngFlow configurations from rbe_autoconfig to rbe_configs_gen (envoyproxy#2037)
  timing test (envoyproxy#2035)
  [CI] Update Xcode to 13.2.1 (envoyproxy#1997)
  owners: adding charles (envoyproxy#2038)

Signed-off-by: JP Simard <jp@jpsim.com>
and point to more representative GitHub issue.

Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim jpsim changed the title WIP: Migrate to Bazel 5.0.0 Migrate to Bazel 5.0.0 Feb 3, 2022
@jpsim jpsim marked this pull request as ready for review February 3, 2022 21:45
@jpsim jpsim requested review from keith and buildbreaker February 3, 2022 21:51
keith
keith previously approved these changes Feb 3, 2022
Copy link
Member

@keith keith left a comment

Choose a reason for hiding this comment

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

seems good unless we can come up with another workaround

@@ -16,10 +16,6 @@ build --spawn_strategy=local
build --verbose_failures
build --workspace_status_command=envoy/bazel/get_workspace_status
build --xcode_version=13.2.1
build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
Copy link
Contributor

Choose a reason for hiding this comment

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

There is a new way to provide these values on Bazel 5.0 if you want to preserve this. At minimum you might want to provide the java_language_version and tool_java_language_version just to make sure that it's consistent moving forward.

Ex:

build \
  --java_language_version=8 \
  --tool_java_language_version=8 \
  --java_runtime_version=lyft_jdk11 \
  --tool_java_runtime_version=lyft_jdk11

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These are actually defined in Envoy now, and we import that .bazelrc file: https://github.com/envoyproxy/envoy/blob/708742e9e8ec44e634a02d16eee0dce826130298/.bazelrc#L19-L20

@jpsim jpsim merged commit c175c77 into envoyproxy:main Feb 4, 2022
@jpsim jpsim deleted the bazel-5 branch February 4, 2022 18:02
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