From 141278a2a060cb595b21ee58b462abae2ae630d2 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 4 Oct 2021 18:25:36 -0700 Subject: [PATCH] fix: no longer need runfiles enabled to use directory artifacts --- .bazelci/presubmit.yml | 26 +++++++------------ .../BUILD.bazel | 1 - .../test/directory_artifacts_tsc/BUILD.bazel | 1 - 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 955a44e59f..235d64425c 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -285,37 +285,29 @@ tasks: # Disabled due to https://github.com/bazelbuild/rules_nodejs/issues/1486 #- "@fine_grained_deps_yarn//typescript/bin:tsc" build_flags: - - "--build_tag_filters=-e2e,-examples,-manual,-fix-windows,-no-bazelci-windows,-requires-runfiles" + - "--build_tag_filters=-e2e,-examples,-manual,-fix-windows,-no-bazelci-windows" build_targets: - "//..." test_flags: # Firefox not supported on Windows with rules_webtesting (if run it exit with success) # See https://github.com/bazelbuild/rules_webtesting/blob/0.3.3/browsers/BUILD.bazel#L66. - - "--test_tag_filters=-e2e,-examples,-fix-windows,-no-bazelci-windows,-requires-runfiles,-manual,-browser:firefox-local,-cypress" + - "--test_tag_filters=-e2e,-examples,-fix-windows,-no-bazelci-windows,-manual,-browser:firefox-local,-cypress" test_targets: - "//..." # //internal/node/test:nodejs_toolchain_windows_amd64_test is a "manual" test that must be run # explicitly; it should pass when running on Windows with no --platform set. - "//internal/node/test:nodejs_toolchain_windows_amd64_test" - windows_runfiles_enabled: - name: windows_runfiles_enabled - platform: windows - test_flags: - - "--test_tag_filters=requires-runfiles" - - "--enable_runfiles" - test_targets: - - "//..." windows_e2e: name: windows_e2e platform: windows build_flags: - - "--build_tag_filters=e2e,-fix-windows,-no-bazelci-windows,-requires-runfiles" + - "--build_tag_filters=e2e,-fix-windows,-no-bazelci-windows" build_targets: - "//..." # We control Bazel version in integration tests, so we don't need USE_BAZEL_VERSION for tests. skip_use_bazel_version_for_test: true test_flags: - - "--test_tag_filters=e2e,-fix-windows,-no-bazelci-windows,-requires-runfiles" + - "--test_tag_filters=e2e,-fix-windows,-no-bazelci-windows" - "--local_ram_resources=792" # test_args will be passed to the nested bazel process - "--test_arg=--local_ram_resources=13288" @@ -323,20 +315,20 @@ tasks: # See https://github.com/bazelbuild/rules_webtesting/blob/0.3.3/browsers/BUILD.bazel#L66. # Chrome fails to launch on Windows inside bazel-in-bazel with: [17:12:04] E/launcher - # spawn D:\...\external\io_bazel_rules_webtesting\third_party\chromedriver\chromedriver.out\chromedriver_win32\chromedriver.exe ENOENT - - "--test_arg=--test_tag_filters=-fix-windows,-no-bazelci-windows,-requires-runfiles,-manual,-browser:chromium-local,-browser:firefox-local" + - "--test_arg=--test_tag_filters=-fix-windows,-no-bazelci-windows,,-manual,-browser:chromium-local,-browser:firefox-local" test_targets: - "//..." windows_examples: name: windows_examples platform: windows build_flags: - - "--build_tag_filters=examples,-fix-windows,-no-bazelci-windows,-requires-runfiles" + - "--build_tag_filters=examples,-fix-windows,-no-bazelci-windows" build_targets: - "//..." # We control Bazel version in integration tests, so we don't need USE_BAZEL_VERSION for tests. skip_use_bazel_version_for_test: true test_flags: - - "--test_tag_filters=examples,-manual,-fix-windows,-no-bazelci-windows,-requires-runfiles,-cypress" + - "--test_tag_filters=examples,-manual,-fix-windows,-no-bazelci-windows,-cypress" - "--local_ram_resources=792" # test_args will be passed to the nested bazel process - "--test_arg=--local_ram_resources=13288" @@ -344,14 +336,14 @@ tasks: # See https://github.com/bazelbuild/rules_webtesting/blob/0.3.3/browsers/BUILD.bazel#L66. # Chrome fails to launch on Windows inside bazel-in-bazel with: [17:12:04] E/launcher - # spawn D:\...\external\io_bazel_rules_webtesting\third_party\chromedriver\chromedriver.out\chromedriver_win32\chromedriver.exe ENOENT - - "--test_arg=--test_tag_filters=-fix-windows,-no-bazelci-windows,-requires-runfiles,-manual,-browser:chromium-local,-browser:firefox-local,-cypress" + - "--test_arg=--test_tag_filters=-fix-windows,-no-bazelci-windows,-manual,-browser:chromium-local,-browser:firefox-local,-cypress" test_targets: - "//..." windows_cross_compile_linux: name: windows_cross_compile_linux platform: windows build_flags: - - "--build_tag_filters=-fix-windows,-no-bazelci-windows,-requires-runfiles" + - "--build_tag_filters=-fix-windows,-no-bazelci-windows" # Build on windows with the node --platform set to linux - "--platforms=@build_bazel_rules_nodejs//toolchains/node:linux_amd64" build_targets: diff --git a/internal/node/test/directory_artifacts_ts_project/BUILD.bazel b/internal/node/test/directory_artifacts_ts_project/BUILD.bazel index 5fd18a8c0c..de998a44e8 100644 --- a/internal/node/test/directory_artifacts_ts_project/BUILD.bazel +++ b/internal/node/test/directory_artifacts_ts_project/BUILD.bazel @@ -3,7 +3,6 @@ load("//packages/typescript:index.bzl", "ts_project") ts_project( name = "tsconfig", srcs = ["main.ts"], - tags = ["requires-runfiles"], tsc = "@npm_directory_artifacts//typescript/bin:tsc", typescript_package = "@npm_directory_artifacts//typescript", deps = ["@npm_directory_artifacts//@types/node"], diff --git a/internal/node/test/directory_artifacts_tsc/BUILD.bazel b/internal/node/test/directory_artifacts_tsc/BUILD.bazel index ded85b5ba3..56b7aec6e0 100644 --- a/internal/node/test/directory_artifacts_tsc/BUILD.bazel +++ b/internal/node/test/directory_artifacts_tsc/BUILD.bazel @@ -17,5 +17,4 @@ tsc( "tsconfig.json", "@npm_directory_artifacts//@types/node", ], - tags = ["requires-runfiles"], )