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

register toolchain only for container exec and use it in py*_image #1173

Merged
merged 12 commits into from
Oct 4, 2019
Prev Previous commit
Next Next commit
update to 0.29.1 for repro tests
  • Loading branch information
Nicolas Lopez committed Oct 3, 2019
commit 9cff26216060ec19a5ce43dd90a6530959e8a089
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ container_pull(

# This image is used by tests/contrib tests.
container_pull(
name = "bazel_0271",
digest = "sha256:436708ebb76c0089b94c46adac5d3332adb8c98ef8f24cb32274400d01bde9e3",
name = "bazel_0291",
digest = "sha256:957c063f1296220c55d640ce82542b4c50d7a75b968fa3fd104e5cf293391ede",
registry = "l.gcr.io",
repository = "google/bazel",
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/repro_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ container_repro_test(

container_repro_test(
name = "derivative_with_volume_repro_test",
base = "@bazel_0271//image",
base = "@bazel_0291//image",
container_diff_args = [
"history",
"file",
Expand Down
16 changes: 1 addition & 15 deletions platforms/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,7 @@ platform(
constraint_values = [
"@io_bazel_rules_docker//platforms:run_in_container",
],
cpu_constraints = [
"@platforms//cpu:x86_32",
"@platforms//cpu:x86_64",
"@platforms//cpu:ppc",
"@platforms//cpu:arm",
"@platforms//cpu:aarch64",
"@platforms//cpu:s390x",
],
host_platform = True,
os_constraints = [
"@platforms//os:osx",
"@platforms//os:freebsd",
"@platforms//os:linux",
"@platforms//os:windows",
],
parents = ["@bazel_tools//platforms:host_platform"]
)

# Default RBE platform that has constraint_value set for the
Expand Down
2 changes: 1 addition & 1 deletion tests/contrib/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ container_repro_test(

container_repro_test(
name = "derivative_with_volume_repro_test",
base = "@bazel_0271//image",
base = "@bazel_0291//image",
container_diff_args = [
"history",
"file",
Expand Down