From 6a4263a1860719979e13030878db7fe1acf3dcfc Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Thu, 26 Jun 2025 18:24:09 +0000 Subject: [PATCH] build: migrate to @devinfra for toolchains (#62302) Migrate the toolchains we depend on to use @devinfra instead of @npm// PR Close #62302 --- .bazelrc | 6 +++--- BUILD.bazel | 6 +++--- WORKSPACE | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.bazelrc b/.bazelrc index 316f0682f34..36974ebfa6c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -109,9 +109,9 @@ build:remote --cpu=k8 build:remote --host_cpu=k8 # Toolchain and platform related flags -build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform -build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform -build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform +build:remote --extra_execution_platforms=@devinfra//bazel/remote-execution:platform_with_network +build:remote --host_platform=@devinfra//bazel/remote-execution:platform_with_network +build:remote --platforms=@devinfra//bazel/remote-execution:platform_with_network # Remote instance and caching build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance diff --git a/BUILD.bazel b/BUILD.bazel index 3b411cc9110..5f5866dd621 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -77,8 +77,8 @@ nodejs_binary( alias( name = "sauce_connect", actual = select({ - "@npm//@angular/build-tooling/bazel/constraints:linux_x64": "@sauce_connect_linux_amd64//:bin/sc", - "@npm//@angular/build-tooling/bazel/constraints:macos_x64": "@sauce_connect_mac//:bin/sc", - "@npm//@angular/build-tooling/bazel/constraints:macos_arm64": "@sauce_connect_mac//:bin/sc", + "@devinfra//bazel/constraints:linux_x64": "@sauce_connect_linux_amd64//:bin/sc", + "@devinfra//bazel/constraints:macos_x64": "@sauce_connect_mac//:bin/sc", + "@devinfra//bazel/constraints:macos_arm64": "@sauce_connect_mac//:bin/sc", }), ) diff --git a/WORKSPACE b/WORKSPACE index dd4e5986c7e..8a2db2240e7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -235,14 +235,6 @@ sass_repositories( yarn_script = YARN_LABEL, ) -# Register git toolchains -register_toolchains( - "@npm//@angular/build-tooling/bazel/git-toolchain:git_linux_toolchain", - "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_x86_toolchain", - "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_arm64_toolchain", - "@npm//@angular/build-tooling/bazel/git-toolchain:git_windows_toolchain", -) - # Fetch sauce connect (tool to open Saucelabs tunnel for Saucelabs browser tests) http_archive( name = "sauce_connect_linux_amd64", @@ -338,3 +330,11 @@ esbuild_register_toolchains( name = "esbuild", esbuild_version = LATEST_ESBUILD_VERSION, ) + +# Register git toolchains +register_toolchains( + "@devinfra//bazel/git-toolchain:git_linux_toolchain", + "@devinfra//bazel/git-toolchain:git_macos_x86_toolchain", + "@devinfra//bazel/git-toolchain:git_macos_arm64_toolchain", + "@devinfra//bazel/git-toolchain:git_windows_toolchain", +)