Use rbe_preconfig for RBE toolchain config (#958)
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 3a6e00e..8a8150a 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -23,6 +23,9 @@
build_targets: *default_linux_targets
test_targets: *default_linux_targets
rbe_ubuntu1604:
+ shell_commands:
+ - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+ - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
build_targets:
- "//..."
test_targets:
@@ -52,6 +55,9 @@
rbe_ubuntu1604_with_aspects:
name: With Aspects
platform: rbe_ubuntu1604
+ shell_commands:
+ - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+ - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
build_targets: *default_linux_targets
test_targets:
- "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
@@ -64,6 +70,9 @@
rbe_ubuntu1604_with_aspects:
name: RBE Rolling Bazel Version With Aspects
platform: rbe_ubuntu1604
+ shell_commands:
+ - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+ - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
build_targets: *default_linux_targets
test_targets:
- "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
@@ -208,6 +217,9 @@
# The bindgen rules currently do not work on RBE
# see: https://github.com/bazelbuild/rules_rust/issues/919
- "-//bindgen/..."
+ shell_commands:
+ - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+ - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
build_targets: *rbe_examples_targets
test_targets: *rbe_examples_targets
build_flags: *aspects_flags
@@ -266,6 +278,9 @@
environment:
RULES_RUST_CRATE_UNIVERSE_BOOTSTRAP: true
working_directory: examples/crate_universe
+ shell_commands:
+ - sed -i 's/^# load("@bazelci_rules/load("@bazelci_rules/' WORKSPACE.bazel
+ - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
build_targets:
- "//..."
test_targets:
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index b6599a6..429da7f 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -37,18 +37,13 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
- name = "bazel_toolchains",
- sha256 = "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024",
- strip_prefix = "bazel-toolchains-4.1.0",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
- "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz",
- ],
+ name = "bazelci_rules",
+ sha256 = "eca21884e6f66a88c358e580fd67a6b148d30ab57b1680f62a96c00f9bc6a07e",
+ strip_prefix = "bazelci_rules-1.0.0",
+ url = "https://github.com/bazelbuild/continuous-integration/releases/download/rules-1.0.0/bazelci_rules-1.0.0.tar.gz",
)
-load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
-
-# Creates a default toolchain config for RBE.
-# Use this as is if you are using the rbe_ubuntu16_04 container,
-# otherwise refer to RBE docs.
-rbe_autoconfig(name = "buildkite_config")
+# To run with RBE on Bazel CI, uncomment the following lines.
+#
+# load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")
+# rbe_preconfig(name = "buildkite_config", toolchain = "ubuntu1604-bazel-java8")
