Skip to content

Commit

Permalink
Don't build //toolchains/... on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
meteorcloudy committed Nov 10, 2021
1 parent 8ff948d commit fac32a5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 26 deletions.
3 changes: 3 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ tasks:
ubuntu2004:
build_targets:
- "//..."
- "-//toolchains/..."
macos:
build_targets:
- "//..."
- "-//toolchains/..."
windows:
build_targets:
- "//..."
- "-//toolchains/..."
55 changes: 29 additions & 26 deletions toolchains/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ java_host_runtime_alias(name = "current_host_java_runtime")
java_toolchain_alias(name = "current_java_toolchain")

# Aliases value of --plugins flag as a JavaPluginInfo
java_plugins_flag_alias(
name = "java_plugins_flag_alias",
)
# TODO: java_plugins_flag_alias cannot be used in rules_java
# java_plugins_flag_alias(
# name = "java_plugins_flag_alias",
# )

# This is necessary to get the *host* Java runtime. Depending on
# //tools/jdk:current_java_runtime from an attribute with the host transition
Expand Down Expand Up @@ -413,24 +414,25 @@ filegroup(
visibility = ["//tools:__pkg__"],
)

py_binary(
name = "proguard_whitelister",
srcs = [
"proguard_whitelister.py",
],
deps = [
"//third_party/py/abseil",
],
)

py_test(
name = "proguard_whitelister_test",
srcs = ["proguard_whitelister_test.py"],
data = ["proguard_whitelister_test_input.pgcfg"],
deps = [
":proguard_whitelister",
],
)
# TODO: should those targets stay in rules_java?
# py_binary(
# name = "proguard_whitelister",
# srcs = [
# "proguard_whitelister.py",
# ],
# deps = [
# "//third_party/py/abseil",
# ],
# )
#
# py_test(
# name = "proguard_whitelister_test",
# srcs = ["proguard_whitelister_test.py"],
# data = ["proguard_whitelister_test_input.pgcfg"],
# deps = [
# ":proguard_whitelister",
# ],
# )

# Aliases for JDKs, so that they are only downloaded when needed.
_JDKS = [
Expand Down Expand Up @@ -489,8 +491,9 @@ java_runtime_version_alias(
visibility = ["//visibility:public"],
)

java_runtime_version_alias(
name = "jdk_8",
runtime_version = "8",
visibility = ["//visibility:public"],
)
# TODO: drop JDK 8 support?
# java_runtime_version_alias(
# name = "jdk_8",
# runtime_version = "8",
# visibility = ["//visibility:public"],
# )

0 comments on commit fac32a5

Please sign in to comment.