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

bazel: update to v5.0.0 #19706

Merged
merged 10 commits into from
Jan 31, 2022
Merged

bazel: update to v5.0.0 #19706

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3576135
WIP bazel: update to v5.0.0
kfaseela Jan 26, 2022
ac0a910
Update envoy-build-tools dependency
kfaseela Jan 27, 2022
1f19b3e
Remove envoy_build_tools.patch
kfaseela Jan 27, 2022
fbd51b5
Fix java runtime version flag
kfaseela Jan 27, 2022
e35e270
Fix java_runtime_version
kfaseela Jan 27, 2022
4894e3b
Fix gcc test
kfaseela Jan 28, 2022
2353f22
Remove outdated java flags
kfaseela Jan 28, 2022
76f434d
Workaround attempt for test failures
kfaseela Jan 28, 2022
dc6bde7
Re-enable precheck
kfaseela Jan 28, 2022
d082087
Incorporate review comments
kfaseela Jan 30, 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
5 changes: 3 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ build --color=yes
build --workspace_status_command="bash bazel/get_workspace_status"
build --incompatible_strict_action_env
build --host_force_python=PY3
build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
build --javabase=@bazel_tools//tools/jdk:remote_jdk11
build --java_runtime_version=remotejdk_11
phlax marked this conversation as resolved.
Show resolved Hide resolved
build --tool_java_runtime_version=remotejdk_11

build --enable_platform_specific_config

# Allow tags to influence execution requirements
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
5.0.0
4 changes: 4 additions & 0 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ envoy_dependencies_extra()
load("//bazel:dependency_imports.bzl", "envoy_dependency_imports")

envoy_dependency_imports()

load("@bazel_skylib//lib:versions.bzl", "versions")
phlax marked this conversation as resolved.
Show resolved Hide resolved

versions.check(minimum_bazel_version = "5.0")
1 change: 1 addition & 0 deletions api/test/build/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ licenses(["notice"]) # Apache 2
api_cc_test(
name = "build_test",
srcs = ["build_test.cc"],
linkstatic = True,
phlax marked this conversation as resolved.
Show resolved Hide resolved
deps = [
"//envoy/api/v2:pkg_cc_proto",
"//envoy/service/accesslog/v2:pkg_cc_proto",
Expand Down
1 change: 1 addition & 0 deletions api/test/validate/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ licenses(["notice"]) # Apache 2
api_cc_test(
name = "pgv_test",
srcs = ["pgv_test.cc"],
linkstatic = True,
deps = [
"@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto",
"@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
Expand Down
39 changes: 0 additions & 39 deletions bazel/external/envoy_build_tools.patch
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,7 @@ def envoy_dependencies(skip_targets = []):
external_http_archive("com_github_google_flatbuffers")
external_http_archive("bazel_toolchains")
external_http_archive("bazel_compdb")
external_http_archive(
name = "envoy_build_tools",
patch_args = ["-p1"],
patches = ["@envoy//bazel/external:envoy_build_tools.patch"],
)
external_http_archive("envoy_build_tools")
external_http_archive("rules_cc")
external_http_archive("rules_pkg")
_com_github_fdio_vpp_vcl()
Expand Down
15 changes: 7 additions & 8 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "bazel-toolchains",
project_desc = "Bazel toolchain configs for RBE",
project_url = "https://github.com/bazelbuild/bazel-toolchains",
version = "4.1.0",
sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
version = "5.1.1",
sha256 = "e52789d4e89c3e2dc0e3446a9684626a626b6bec3fde787d70bae37c6ebcc47f",
strip_prefix = "bazel-toolchains-{version}",
urls = [
"https://github.com/bazelbuild/bazel-toolchains/releases/download/{version}/bazel-toolchains-{version}.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/{version}.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/v{version}.tar.gz",
],
release_date = "2021-05-21",
release_date = "2021-11-30",
use_category = ["build"],
),
build_bazel_rules_apple = dict(
Expand Down Expand Up @@ -65,11 +64,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "envoy-build-tools",
project_desc = "Common build tools shared by the Envoy/UDPA ecosystem",
project_url = "https://github.com/envoyproxy/envoy-build-tools",
version = "55a7bbe700586729bd38231a9a6f3dcd1ff85e7d",
sha256 = "11893be9f0334a7e12ffc04b3b034dffe0bb5516d36654011532136c7929ae27",
version = "1162be3669036d2c09359a95d39ff65fc6608f39",
sha256 = "8f5ac011a443649a27a7b82bc447de4f564f9cb5b6812d87c3bc1b1e74d2055f",
strip_prefix = "envoy-build-tools-{version}",
urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
release_date = "2021-09-28",
release_date = "2022-01-28",
use_category = ["build"],
),
boringssl = dict(
Expand Down