Skip to content

Commit 97933d8

Browse files
meteorcloudyalexeagle
authored andcommitted
fix: patching rules_webtesting to fix chrome path
1 parent 2d6931c commit 97933d8

4 files changed

Lines changed: 29 additions & 0 deletions

File tree

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ npm_package(
5656
srcs = glob(["*.bzl"]) + [
5757
"BUILD.bazel",
5858
"LICENSE",
59+
"rules_webtesting.patch",
5960
],
6061
# Don't rename BUILD files as this package is not published to npm
6162
# but is compressed in "release" below and published as a .tar.gz to GitHub

packages/karma/src/package.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ def rules_karma_dependencies():
4040
sha256 = "f1f4d2c2f88d2beac64c82499a1e762b037966675dd892da89c87e39d72b33f6",
4141
# Using alexeagle to workaround https://github.com/bazelbuild/rules_webtesting/issues/382
4242
urls = ["https://github.com/alexeagle/rules_webtesting/releases/download/0.3.2/rules_webtesting.tar.gz"],
43+
patches = ["@build_bazel_rules_nodejs//:rules_webtesting.patch"],
44+
patch_args = ["-p1"],
4345
)
4446

4547
def _maybe(repo_rule, name, **kwargs):

packages/protractor/src/package.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ def npm_bazel_protractor_dependencies():
3232
sha256 = "f1f4d2c2f88d2beac64c82499a1e762b037966675dd892da89c87e39d72b33f6",
3333
# Using alexeagle to workaround https://github.com/bazelbuild/rules_webtesting/issues/382
3434
urls = ["https://github.com/alexeagle/rules_webtesting/releases/download/0.3.2/rules_webtesting.tar.gz"],
35+
patches = ["@build_bazel_rules_nodejs//:rules_webtesting.patch"],
36+
patch_args = ["-p1"],
3537
)
3638

3739
def _maybe(repo_rule, name, **kwargs):

rules_webtesting.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
commit 324d178e836b8f93c93321312e890176c986147a
2+
Author: Yun Peng <pcloudy@google.com>
3+
Date: Tue Aug 27 13:42:35 2019 +0200
4+
5+
Fix chromium rule and definition for Windows
6+
7+
1. Write output dir of named_files in metadata. This could help us locate named
8+
files in runfiles, because they are under the tree artifact of the output dir.
9+
10+
2. Fix the chromium path for Windows
11+
12+
diff --git a/third_party/chromium/BUILD.bazel b/third_party/chromium/BUILD.bazel
13+
index 384d018..2cbbb4a 100644
14+
--- a/third_party/chromium/BUILD.bazel
15+
+++ b/third_party/chromium/BUILD.bazel
16+
@@ -33,7 +33,7 @@ web_test_archive(
17+
"CHROMIUM": "chrome-mac/Chromium.app/Contents/MacOS/chromium",
18+
},
19+
"//common/conditions:windows": {
20+
- "CHROMIUM": "chrome-win32/chrome.exe",
21+
+ "CHROMIUM": "chrome-win/chrome.exe",
22+
},
23+
}),
24+
visibility = ["//browsers:__subpackages__"],

0 commit comments

Comments
 (0)