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

Fix depset issues with/upgrade to Bazel 0.27.1 #578

Merged
merged 5 commits into from
Jul 2, 2019
Merged

Fix depset issues with/upgrade to Bazel 0.27.1 #578

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a4cf18
Update rules_closure version.
danfabi Jun 22, 2019
732788a
As of Bazel 0.27.0, depset is no longer iterable.
danfabi Jun 22, 2019
5918dee
Update Bazel version to 0.27.0
danfabi Jun 22, 2019
621701e
Let _proto_include_paths return list instead of depset.
danfabi Jun 22, 2019
51da4f0
Update Bazel to 0.27.1
danfabi Jul 2, 2019
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
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_bazel_rules_closure",
sha256 = "1f8d2e169bb292ef2adbe563bd66d5b8d4b462b6b869a67647e771ecef4b5030",
strip_prefix = "rules_closure-a176ec89a1b251bb5442ba569d47cee3c053e633",
sha256 = "fecda06179906857ac79af6500124bf03fe1630fd1b3d4dcf6c65346b9c0725d",
strip_prefix = "rules_closure-03110588392d8c6c05b99c08a6f1c2121604ca27",
urls = [
"https://github.com/bazelbuild/rules_closure/archive/a176ec89a1b251bb5442ba569d47cee3c053e633.zip",
"https://github.com/bazelbuild/rules_closure/archive/03110588392d8c6c05b99c08a6f1c2121604ca27.zip",
],
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/closure_grpc_web_library.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _proto_include_path(proto):
return path

def _proto_include_paths(protos):
return depset([_proto_include_path(proto) for proto in protos])
return [_proto_include_path(proto) for proto in protos]

def _generate_closure_grpc_web_src_progress_message(name):
# TODO(yannic): Add a better message?
Expand All @@ -55,7 +55,7 @@ def _generate_closure_grpc_web_srcs(
mode,
sources,
transitive_sources):
all_sources = [src for src in sources] + [src for src in transitive_sources]
all_sources = [src for src in sources] + [src for src in transitive_sources.to_list()]
proto_include_paths = [
"-I%s" % p
for p in _proto_include_paths(
Expand Down
2 changes: 1 addition & 1 deletion scripts/kokoro.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ done
docker-compose -f advanced.yml build

# Run all bazel unit tests
BAZEL_VERSION=0.23.1
BAZEL_VERSION=0.27.0
wget https://github.com/bazelbuild/bazel/releases/download/"${BAZEL_VERSION}"/bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh
chmod +x ./bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh
./bazel-"${BAZEL_VERSION}"-installer-linux-x86_64.sh --user
Expand Down