Skip to content

Commit 5071331

Browse files
devversionthePunderWoman
authored andcommitted
build: use platform from shared dev-infra package for remote execution (angular#41767)
Uses the new shared RBE platform from the dev-infra package. PR Close angular#41767
1 parent 1b00533 commit 5071331

File tree

4 files changed

+5
-47
lines changed

4 files changed

+5
-47
lines changed

.bazelrc

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,11 @@ build:remote --cpu=k8
114114
build:remote --host_cpu=k8
115115

116116
# Toolchain and platform related flags
117-
build:remote --host_javabase=@rbe_ubuntu1604_angular//java:jdk
118-
build:remote --javabase=@rbe_ubuntu1604_angular//java:jdk
119-
build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
120-
build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
121-
build:remote --crosstool_top=@rbe_ubuntu1604_angular//cc:toolchain
122-
build:remote --extra_toolchains=@rbe_ubuntu1604_angular//config:cc-toolchain
123-
build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
124-
build:remote --host_platform=//tools:rbe_ubuntu1604-angular
125-
build:remote --platforms=//tools:rbe_ubuntu1604-angular
117+
build:remote --crosstool_top=//dev-infra/bazel/remote-execution/cpp:cc_toolchain_suite
118+
build:remote --extra_toolchains=//dev-infra/bazel/remote-execution/cpp:cc_toolchain
119+
build:remote --extra_execution_platforms=//dev-infra/bazel/remote-execution:platform
120+
build:remote --host_platform=//dev-infra/bazel/remote-execution:platform
121+
build:remote --platforms=//dev-infra/bazel/remote-execution:platform
126122

127123
# Remote instance and caching
128124
build:remote --remote_instance_name=projects/internal-200822/instances/default_instance

WORKSPACE

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,27 +62,3 @@ sass_repositories()
6262
load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
6363

6464
skydoc_repositories()
65-
66-
load("@bazel_toolchains//rules:environments.bzl", "clang_env")
67-
load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
68-
69-
rbe_autoconfig(
70-
name = "rbe_ubuntu1604_angular",
71-
# Need to specify a base container digest in order to ensure that we can use the checked-in
72-
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
73-
# need to pull the image and run it in order determine the toolchain configuration. See:
74-
# https://github.com/bazelbuild/bazel-toolchains/blob/4.0.0/configs/ubuntu16_04_clang/versions.bzl
75-
base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
76-
# Note that if you change the `digest`, you might also need to update the
77-
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
78-
# and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
79-
# the same Clang and JDK installed. Clang is needed because of the dependency on
80-
# @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
81-
digest = "sha256:dddaaddbe07a61c2517f9b08c4977fc23c4968fcb6c0b8b5971e955d2de7a961",
82-
env = clang_env(),
83-
registry = "marketplace.gcr.io",
84-
# We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
85-
# a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
86-
repository = "google/rbe-ubuntu16-04-webtest",
87-
use_checked_in_confs = "Force",
88-
)

packages/bazel/package.bzl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ def rules_angular_dev_dependencies():
2424
shorter.
2525
"""
2626

27-
# Needed for Remote Execution
28-
# https://github.com/bazelbuild/bazel-toolchains/releases
29-
_maybe(
30-
http_archive,
31-
name = "bazel_toolchains",
32-
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
33-
strip_prefix = "bazel-toolchains-4.0.0",
34-
urls = [
35-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
36-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
37-
],
38-
)
39-
4027
#############################################
4128
# Dependencies for generating documentation #
4229
#############################################

renovate.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"packagePatterns": [
7979
"^@bazel/.*",
8080
"^build_bazel.*",
81-
"bazel_toolchains"
8281
],
8382
"groupName": "bazel",
8483
"pinVersions": false

0 commit comments

Comments
 (0)