Skip to content

Commit

Permalink
bazel: update to 6.0.0rc4 (envoyproxy#24235)
Browse files Browse the repository at this point in the history
This reverts commit dede92e. Originally
this was reverted because of envoyproxy#23985
  • Loading branch information
keith authored Dec 7, 2022
1 parent 06005e7 commit 54e7d0e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ build:coverage --define=dynamic_link_tests=true
build:coverage --define=ENVOY_CONFIG_COVERAGE=1
build:coverage --cxxopt="-DENVOY_CONFIG_COVERAGE=1"
build:coverage --coverage_support=@envoy//bazel/coverage:coverage_support
build:coverage --test_env=CC_CODE_COVERAGE_SCRIPT=external/envoy/bazel/coverage/collect_cc_coverage.sh
build:coverage --test_env=CC_CODE_COVERAGE_SCRIPT=bazel/coverage/collect_cc_coverage.sh
build:coverage --test_env=HEAPCHECK=
build:coverage --combined_report=lcov
build:coverage --strategy=TestRunner=sandboxed,local
Expand Down Expand Up @@ -381,6 +381,7 @@ build:windows --define tcmalloc=disabled
build:windows --define wasm=disabled
build:windows --define manual_stamp=manual_stamp
build:windows --cxxopt="/std:c++17"
build:windows --output_groups=+pdb_file

# TODO(wrowe,sunjayBhatia): Resolve bugs upstream in curl and rules_foreign_cc
# See issue https://github.com/bazelbuild/rules_foreign_cc/issues/301
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0-pre.20220706.4
6.0.0rc4
13 changes: 13 additions & 0 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1380,6 +1380,19 @@ REPOSITORY_LOCATIONS_SPEC = dict(
release_date = "2022-03-30",
cpe = "N/A",
),
rules_license = dict(
project_name = "rules_license",
project_desc = "Bazel rules for checking open source licenses",
project_url = "https://github.com/bazelbuild/rules_license",
version = "0.0.3",
sha256 = "00ccc0df21312c127ac4b12880ab0f9a26c1cff99442dc6c5a331750360de3c3",
urls = ["https://github.com/bazelbuild/rules_license/releases/download/{version}/rules_license-{version}.tar.gz"],
use_category = ["build", "dataplane_core", "controlplane"],
release_date = "2022-05-28",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/bazelbuild/rules_license/blob/{version}/LICENSE",
),
)

def _compiled_protoc_deps(locations, versions):
Expand Down

0 comments on commit 54e7d0e

Please sign in to comment.