Skip to content

Commit d8a0ccb

Browse files
committed
fix: account for breaking path change in new chromedriver distro
See bazelbuild/rules_webtesting@62062b4#diff-bb710201187c4ad0a3fbbe941ffc4b0a where the paths were updated
1 parent f06553a commit d8a0ccb

11 files changed

Lines changed: 31 additions & 211 deletions

File tree

WORKSPACE

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
146146

147147
web_test_repositories()
148148

149-
# Temporary work-around for https://github.com/angular/angular/issues/28681
150-
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
151-
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
149+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
152150

153-
browser_repositories()
151+
browser_repositories(chromium = True)
154152

155153
#
156154
# Dependencies to run skydoc & generating documentation
@@ -335,7 +333,7 @@ e2e_packages_setup_workspace()
335333
git_repository_under_test(
336334
name = "e2e_angular_bazel_example",
337335
branch = "add-buildkite-filter-flags",
338-
remote = "http://github.com/gregmagolan/angular-bazel-example.git",
336+
remote = "http://github.com/angular/angular-bazel-example.git",
339337
)
340338

341339
# Mock npm_angular_bazel for @e2e_angular_bazel_example//:bazel_integration_test_files target

e2e/karma/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4545

4646
web_test_repositories()
4747

48-
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
48+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
4949

50-
browser_repositories()
50+
browser_repositories(chromium = True)

e2e/karma_stack_trace/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4545

4646
web_test_repositories()
4747

48-
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
48+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
4949

50-
browser_repositories()
50+
browser_repositories(chromium = True)
5151

5252
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
5353

e2e/karma_typescript/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4545

4646
web_test_repositories()
4747

48-
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
48+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
4949

50-
browser_repositories()
50+
browser_repositories(chromium = True)
5151

5252
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
5353

e2e/ts_devserver/WORKSPACE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
5050

5151
web_test_repositories()
5252

53-
# Temporary work-around for https://github.com/angular/angular/issues/28681
54-
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
55-
load("@npm_bazel_protractor//:browser_repositories.bzl", "browser_repositories")
53+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
5654

57-
browser_repositories()
55+
browser_repositories(chromium = True)

examples/app/WORKSPACE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
5050

5151
web_test_repositories()
5252

53-
# Temporary work-around for https://github.com/angular/angular/issues/28681
54-
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
55-
load("@npm_bazel_protractor//:browser_repositories.bzl", "browser_repositories")
53+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
5654

57-
browser_repositories()
55+
browser_repositories(chromium = True)

examples/protocol_buffers/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
5656

5757
web_test_repositories()
5858

59-
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
59+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", "browser_repositories")
6060

61-
browser_repositories()
61+
browser_repositories(chromium = True)
6262

6363
load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
6464

examples/web_testing/WORKSPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4545

4646
web_test_repositories()
4747

48+
# Note: intentionally loads from the deprecated location to assert that it still works
4849
load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
4950

5051
browser_repositories()

examples/webapp/WORKSPACE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
4646

4747
web_test_repositories()
4848

49-
# Temporary work-around for https://github.com/angular/angular/issues/28681
50-
# TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
49+
# Note: intentionally loads from the deprecated location to assert that it still works
5150
load("@npm_bazel_protractor//:browser_repositories.bzl", "browser_repositories")
5251

5352
browser_repositories()

packages/karma/src/browser_repositories.bzl

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -15,100 +15,13 @@
1515
"""Pinned browser versions tested against in https://github.com/bazelbuild/rules_typescript CI.
1616
"""
1717

18-
load("@io_bazel_rules_webtesting//web/internal:platform_http_file.bzl", "platform_http_file")
18+
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl", _browser_repositories = "browser_repositories")
1919

2020
def browser_repositories():
21-
"""Load pinned rules_webtesting browser versions."""
21+
print("""
22+
WARNING: @npm_bazel_karma//:browser_repositories.bzl is deprecated.
23+
replace this with @io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl
24+
and choose some specific browsers to test on (eg. chromium=True)
2225
23-
platform_http_file(
24-
name = "org_chromium_chromium",
25-
amd64_sha256 =
26-
"eb6754c7918da5eab42a42bbda7efdf7f1661eaa3802b8940841f0c2c312299f",
27-
amd64_urls = [
28-
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
29-
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/638880/
30-
# Current linux stable as of 2019-05-15
31-
# https://www.chromium.org/developers/calendar
32-
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/638880/chrome-linux.zip",
33-
],
34-
licenses = ["notice"], # BSD 3-clause (maybe more?)
35-
macos_sha256 =
36-
"c48bdffac6a91c85c17a848012b1a45fbf36e3a2d4aaac5b6ded8ac65b1d96e3",
37-
macos_urls = [
38-
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
39-
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/638880/
40-
# Current mac stable as of 2019-05-15
41-
# https://www.chromium.org/developers/calendar
42-
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/638880/chrome-mac.zip",
43-
],
44-
windows_sha256 =
45-
"d1bb728118c12ea436d8ea07dba980789e7d860aa664dd1fad78bc20e8d9391c",
46-
windows_urls = [
47-
# Chromium 66.0.3359.0 (2018-03-01 snaphot 540270)
48-
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/612439/
49-
# NOTE: There is an issue with chromium 68-71 with Windows: https://bugs.chromium.org/p/chromium/issues/detail?id=540270
50-
# and pinning to 72 is not possible as the archive name has changed to chrome-win.zip which breaks
51-
# as the executable path the hard-coded in rules_webtesting and includes the archive name.
52-
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/540270/chrome-win32.zip",
53-
],
54-
)
55-
56-
platform_http_file(
57-
name = "org_chromium_chromedriver",
58-
amd64_sha256 =
59-
"ec9dbe021338f0befaecca702abc576cb7cc31a2f5a852c2c41e94721af5d3ad",
60-
amd64_urls = [
61-
# ChromeDriver 74.0.3729.6 supports Chrome 74
62-
# http://chromedriver.chromium.org/downloads
63-
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip",
64-
],
65-
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
66-
macos_sha256 =
67-
"b4b73681404d231d81a9b7ab9d4f0cb090f3e69240296eca2eb46e2629519152",
68-
macos_urls = [
69-
# ChromeDriver 74.0.3729.6 supports Chrome 74
70-
# http://chromedriver.chromium.org/downloads
71-
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_mac64.zip",
72-
],
73-
windows_sha256 =
74-
"a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
75-
windows_urls = [
76-
# ChromeDriver 2.38 supports Chrome v65-67
77-
# http://chromedriver.chromium.org/downloads
78-
"https://chromedriver.storage.googleapis.com/2.38/chromedriver_win32.zip",
79-
],
80-
)
81-
82-
platform_http_file(
83-
name = "org_mozilla_firefox",
84-
amd64_sha256 =
85-
"3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de",
86-
amd64_urls = [
87-
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
88-
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
89-
],
90-
licenses = ["reciprocal"], # MPL 2.0
91-
macos_sha256 =
92-
"bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5",
93-
macos_urls = [
94-
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
95-
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
96-
],
97-
)
98-
99-
platform_http_file(
100-
name = "org_mozilla_geckodriver",
101-
amd64_sha256 =
102-
"c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6",
103-
amd64_urls = [
104-
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
105-
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
106-
],
107-
licenses = ["reciprocal"], # MPL 2.0
108-
macos_sha256 =
109-
"ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce",
110-
macos_urls = [
111-
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
112-
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
113-
],
114-
)
26+
""")
27+
_browser_repositories(chromium = True, firefox = True)

0 commit comments

Comments
 (0)