fix: patching rules_webtesting to fix chrome path

bazel-contrib · Aug 28, 2019 · 97933d8 · 97933d8
1 parent 2d6931c
commit 97933d8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -56,6 +56,7 @@ npm_package(
     srcs = glob(["*.bzl"]) + [
         "BUILD.bazel",
         "LICENSE",
+        "rules_webtesting.patch",
     ],
     # Don't rename BUILD files as this package is not published to npm
     # but is compressed in "release" below and published as a .tar.gz to GitHub

diff --git a/packages/karma/src/package.bzl b/packages/karma/src/package.bzl
@@ -40,6 +40,8 @@ def rules_karma_dependencies():
         sha256 = "f1f4d2c2f88d2beac64c82499a1e762b037966675dd892da89c87e39d72b33f6",
         # Using alexeagle to workaround https://github.com/bazelbuild/rules_webtesting/issues/382
         urls = ["https://github.com/alexeagle/rules_webtesting/releases/download/0.3.2/rules_webtesting.tar.gz"],
+        patches = ["@build_bazel_rules_nodejs//:rules_webtesting.patch"],
+        patch_args = ["-p1"],
     )
 
 def _maybe(repo_rule, name, **kwargs):

diff --git a/packages/protractor/src/package.bzl b/packages/protractor/src/package.bzl
@@ -32,6 +32,8 @@ def npm_bazel_protractor_dependencies():
         sha256 = "f1f4d2c2f88d2beac64c82499a1e762b037966675dd892da89c87e39d72b33f6",
         # Using alexeagle to workaround https://github.com/bazelbuild/rules_webtesting/issues/382
         urls = ["https://github.com/alexeagle/rules_webtesting/releases/download/0.3.2/rules_webtesting.tar.gz"],
+        patches = ["@build_bazel_rules_nodejs//:rules_webtesting.patch"],
+        patch_args = ["-p1"],
     )
 
 def _maybe(repo_rule, name, **kwargs):

diff --git a/rules_webtesting.patch b/rules_webtesting.patch
@@ -0,0 +1,24 @@
+commit 324d178e836b8f93c93321312e890176c986147a
+Author: Yun Peng <[email protected]>
+Date:   Tue Aug 27 13:42:35 2019 +0200
+
+    Fix chromium rule and definition for Windows
+
+    1. Write output dir of named_files in metadata. This could help us locate named
+    files in runfiles, because they are under the tree artifact of the output dir.
+
+    2. Fix the chromium path for Windows
+
+diff --git a/third_party/chromium/BUILD.bazel b/third_party/chromium/BUILD.bazel
+index 384d018..2cbbb4a 100644
+--- a/third_party/chromium/BUILD.bazel
++++ b/third_party/chromium/BUILD.bazel
+@@ -33,7 +33,7 @@ web_test_archive(
+             "CHROMIUM": "chrome-mac/Chromium.app/Contents/MacOS/chromium",
+         },
+         "//common/conditions:windows": {
+-            "CHROMIUM": "chrome-win32/chrome.exe",
++            "CHROMIUM": "chrome-win/chrome.exe",
+         },
+     }),
+     visibility = ["//browsers:__subpackages__"],