diff --git a/WORKSPACE b/WORKSPACE index f31e197f87e..6bec6fd5ff3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,20 +8,6 @@ workspace( load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("//:yarn.bzl", "YARN_LABEL") -# Add a patch fix for rules_webtesting v0.3.5 required for enabling runfiles on Windows. -# TODO: Remove the http_archive for this transitive dependency when a release is cut -# for https://github.com/bazelbuild/rules_webtesting/commit/581b1557e382f93419da6a03b91a45c2ac9a9ec8 -# and the version is updated in rules_nodejs. -http_archive( - name = "io_bazel_rules_webtesting", - patch_args = ["-p1"], - patches = [ - "//:tools/bazel-repo-patches/rules_webtesting__windows_runfiles_fix.patch", - ], - sha256 = "e9abb7658b6a129740c0b3ef6f5a2370864e102a5ba5ffca2cea565829ed825a", - urls = ["https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.5/rules_webtesting.tar.gz"], -) - http_archive( name = "build_bazel_rules_nodejs", patches = [ diff --git a/tools/bazel-repo-patches/rules_webtesting__windows_runfiles_fix.patch b/tools/bazel-repo-patches/rules_webtesting__windows_runfiles_fix.patch deleted file mode 100644 index 4274a7faee1..00000000000 --- a/tools/bazel-repo-patches/rules_webtesting__windows_runfiles_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/web/internal/windows_utils.bzl b/web/internal/windows_utils.bzl -index 4bec20e..cada638 100644 ---- a/web/internal/windows_utils.bzl -+++ b/web/internal/windows_utils.bzl -@@ -35,6 +35,9 @@ if "%RUNFILES_MANIFEST_ONLY%" neq "1" ( - set %~2=%~1 - exit /b 0 - ) -+if exist "%RUNFILES_DIR%" ( -+ set RUNFILES_MANIFEST_FILE=%RUNFILES_DIR%_manifest -+) - if "%RUNFILES_MANIFEST_FILE%" equ "" ( - set RUNFILES_MANIFEST_FILE=%~f0.runfiles\MANIFEST - )