build: fix remote execution not enabled on linux builds

Looks like the path is incorrect and we didn't run with RBE.
angular · Jun 20, 2022 · 5df32aa · 5df32aa
1 parent 40ee0ff
commit 5df32aa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/.circleci/setup-bazel.sh b/.circleci/setup-bazel.sh
@@ -19,4 +19,4 @@ openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k ${GCP_DECRYPT_TOKEN} \
 echo "export GOOGLE_APPLICATION_CREDENTIALS=$HOME/.gcp_credentials" >> $BASH_ENV
 
 # Update the CircleCI Bazel configuration to always use remote execution.
-echo "build --config=remote" >> .circleci/bazel.rc
+echo "build --config=remote" >> .circleci/linux-bazel.rc
diff --git a/bazel/api-golden/test/BUILD.bazel b/bazel/api-golden/test/BUILD.bazel
@@ -1,4 +1,17 @@
 load("//bazel/api-golden:index.bzl", "api_golden_test", "api_golden_test_npm_package")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
+
+package(default_visibility = ["//bazel/api-golden/test:__pkg__"])
+
+copy_to_bin(
+    name = "test_package_golden_dir",
+    srcs = glob(["goldens/test_package/**"]),
+)
+
+copy_to_bin(
+    name = "pkg_no_exports_field_golden_dir",
+    srcs = glob(["goldens/pkg_no_exports_field/**"]),
+)
 
 api_golden_test(
     name = "test_explicit_files",
@@ -16,8 +29,8 @@ api_golden_test(
 api_golden_test_npm_package(
     name = "test_npm_package",
     data = [
-        "goldens/test_package",
-        "//bazel/api-golden/test/fixtures:test_package",
+        ":test_package_golden_dir",
+        "//bazel/api-golden/test/fixtures:test_package_fixture",
     ],
     golden_dir = "dev-infra/bazel/api-golden/test/goldens/test_package",
     npm_package = "dev-infra/bazel/api-golden/test/fixtures/test_package",
@@ -31,8 +44,8 @@ api_golden_test_npm_package(
 api_golden_test_npm_package(
     name = "test_npm_package_no_exports_field",
     data = [
-        "goldens/pkg_no_exports_field",
-        "//bazel/api-golden/test/fixtures:pkg_no_exports_field",
+        ":pkg_no_exports_field_golden_dir",
+        "//bazel/api-golden/test/fixtures:pkg_no_exports_field_fixture",
     ],
     golden_dir = "dev-infra/bazel/api-golden/test/goldens/pkg_no_exports_field",
     npm_package = "dev-infra/bazel/api-golden/test/fixtures/pkg_no_exports_field",

diff --git a/bazel/api-golden/test/fixtures/BUILD.bazel b/bazel/api-golden/test/fixtures/BUILD.bazel
@@ -1,12 +1,17 @@
 load("//tools:defaults.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
 
 package(default_visibility = ["//bazel/api-golden/test:__pkg__"])
 
-# Expose these two fixture directories as tree artifacts.
-exports_files([
-    "test_package",
-    "pkg_no_exports_field",
-])
+copy_to_bin(
+    name = "test_package_fixture",
+    srcs = glob(["test_package/**"]),
+)
+
+copy_to_bin(
+    name = "pkg_no_exports_field_fixture",
+    srcs = glob(["pkg_no_exports_field/**"]),
+)
 
 ts_library(
     name = "test_lib",