Skip to content

Commit

Permalink
fix: account for breaking path change in new chromedriver distro
Browse files Browse the repository at this point in the history 
See bazelbuild/rules_webtesting@62062b4#diff-bb710201187c4ad0a3fbbe941ffc4b0a where the paths were updated
  • Loading branch information
@alexeagle
alexeagle committed Aug 28, 2019
1 parent f06553a commit d8a0ccb
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 211 deletions.
8 changes: 3 additions & 5 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)

#
# Dependencies to run skydoc & generating documentation
Expand Down Expand Up @@ -335,7 +333,7 @@ e2e_packages_setup_workspace()
git_repository_under_test(
name = "e2e_angular_bazel_example",
branch = "add-buildkite-filter-flags",
remote = "http://github.com/gregmagolan/angular-bazel-example.git",
remote = "http://github.com/angular/angular-bazel-example.git",
)

# Mock npm_angular_bazel for @e2e_angular_bazel_example//:bazel_integration_test_files target
Expand Down
4 changes: 2 additions & 2 deletions e2e/karma/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)
4 changes: 2 additions & 2 deletions e2e/karma_stack_trace/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)

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

Expand Down
4 changes: 2 additions & 2 deletions e2e/karma_typescript/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)

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

Expand Down
6 changes: 2 additions & 4 deletions e2e/ts_devserver/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)
6 changes: 2 additions & 4 deletions examples/app/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)
4 changes: 2 additions & 2 deletions examples/protocol_buffers/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
browser_repositories(chromium = True)

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

Expand Down
1 change: 1 addition & 0 deletions examples/web_testing/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
Expand Down
3 changes: 1 addition & 2 deletions examples/webapp/WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories()

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

browser_repositories()
101 changes: 7 additions & 94 deletions packages/karma/src/browser_repositories.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,100 +15,13 @@
"""Pinned browser versions tested against in https://github.com/bazelbuild/rules_typescript CI.
"""

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

def browser_repositories():
"""Load pinned rules_webtesting browser versions."""
print("""
WARNING: @npm_bazel_karma//:browser_repositories.bzl is deprecated.
replace this with @io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl
and choose some specific browsers to test on (eg. chromium=True)
platform_http_file(
name = "org_chromium_chromium",
amd64_sha256 =
"eb6754c7918da5eab42a42bbda7efdf7f1661eaa3802b8940841f0c2c312299f",
amd64_urls = [
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/638880/
# Current linux stable as of 2019-05-15
# https://www.chromium.org/developers/calendar
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/638880/chrome-linux.zip",
],
licenses = ["notice"], # BSD 3-clause (maybe more?)
macos_sha256 =
"c48bdffac6a91c85c17a848012b1a45fbf36e3a2d4aaac5b6ded8ac65b1d96e3",
macos_urls = [
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/638880/
# Current mac stable as of 2019-05-15
# https://www.chromium.org/developers/calendar
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/638880/chrome-mac.zip",
],
windows_sha256 =
"d1bb728118c12ea436d8ea07dba980789e7d860aa664dd1fad78bc20e8d9391c",
windows_urls = [
# Chromium 66.0.3359.0 (2018-03-01 snaphot 540270)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/612439/
# NOTE: There is an issue with chromium 68-71 with Windows: https://bugs.chromium.org/p/chromium/issues/detail?id=540270
# and pinning to 72 is not possible as the archive name has changed to chrome-win.zip which breaks
# as the executable path the hard-coded in rules_webtesting and includes the archive name.
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/540270/chrome-win32.zip",
],
)

platform_http_file(
name = "org_chromium_chromedriver",
amd64_sha256 =
"ec9dbe021338f0befaecca702abc576cb7cc31a2f5a852c2c41e94721af5d3ad",
amd64_urls = [
# ChromeDriver 74.0.3729.6 supports Chrome 74
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip",
],
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
macos_sha256 =
"b4b73681404d231d81a9b7ab9d4f0cb090f3e69240296eca2eb46e2629519152",
macos_urls = [
# ChromeDriver 74.0.3729.6 supports Chrome 74
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_mac64.zip",
],
windows_sha256 =
"a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
windows_urls = [
# ChromeDriver 2.38 supports Chrome v65-67
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/2.38/chromedriver_win32.zip",
],
)

platform_http_file(
name = "org_mozilla_firefox",
amd64_sha256 =
"3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de",
amd64_urls = [
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
],
licenses = ["reciprocal"], # MPL 2.0
macos_sha256 =
"bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5",
macos_urls = [
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
],
)

platform_http_file(
name = "org_mozilla_geckodriver",
amd64_sha256 =
"c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6",
amd64_urls = [
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
],
licenses = ["reciprocal"], # MPL 2.0
macos_sha256 =
"ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce",
macos_urls = [
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
],
)
""")
_browser_repositories(chromium = True, firefox = True)
101 changes: 7 additions & 94 deletions packages/protractor/src/browser_repositories.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,100 +15,13 @@
"""Pinned browser versions tested against in https://github.com/bazelbuild/rules_nodejs CI.
"""

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

def browser_repositories():
"""Load pinned rules_webtesting browser versions."""
print("""
WARNING: @npm_bazel_karma//:browser_repositories.bzl is deprecated.
replace this with @io_bazel_rules_webtesting//web/versioned:browsers-0.3.2.bzl
and choose some specific browsers to test on (eg. chromium=True)
platform_http_file(
name = "org_chromium_chromium",
amd64_sha256 =
"eb6754c7918da5eab42a42bbda7efdf7f1661eaa3802b8940841f0c2c312299f",
amd64_urls = [
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/638880/
# Current linux stable as of 2019-05-15
# https://www.chromium.org/developers/calendar
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/638880/chrome-linux.zip",
],
licenses = ["notice"], # BSD 3-clause (maybe more?)
macos_sha256 =
"c48bdffac6a91c85c17a848012b1a45fbf36e3a2d4aaac5b6ded8ac65b1d96e3",
macos_urls = [
# Chromium 74.0.3729.0 (2019-03-08 snaphot 638880)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/638880/
# Current mac stable as of 2019-05-15
# https://www.chromium.org/developers/calendar
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/638880/chrome-mac.zip",
],
windows_sha256 =
"d1bb728118c12ea436d8ea07dba980789e7d860aa664dd1fad78bc20e8d9391c",
windows_urls = [
# Chromium 66.0.3359.0 (2018-03-01 snaphot 540270)
# https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/612439/
# NOTE: There is an issue with chromium 68-71 with Windows: https://bugs.chromium.org/p/chromium/issues/detail?id=540270
# and pinning to 72 is not possible as the archive name has changed to chrome-win.zip which breaks
# as the executable path the hard-coded in rules_webtesting and includes the archive name.
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/540270/chrome-win32.zip",
],
)

platform_http_file(
name = "org_chromium_chromedriver",
amd64_sha256 =
"ec9dbe021338f0befaecca702abc576cb7cc31a2f5a852c2c41e94721af5d3ad",
amd64_urls = [
# ChromeDriver 74.0.3729.6 supports Chrome 74
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip",
],
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
macos_sha256 =
"b4b73681404d231d81a9b7ab9d4f0cb090f3e69240296eca2eb46e2629519152",
macos_urls = [
# ChromeDriver 74.0.3729.6 supports Chrome 74
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_mac64.zip",
],
windows_sha256 =
"a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
windows_urls = [
# ChromeDriver 2.38 supports Chrome v65-67
# http://chromedriver.chromium.org/downloads
"https://chromedriver.storage.googleapis.com/2.38/chromedriver_win32.zip",
],
)

platform_http_file(
name = "org_mozilla_firefox",
amd64_sha256 =
"3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de",
amd64_urls = [
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
],
licenses = ["reciprocal"], # MPL 2.0
macos_sha256 =
"bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5",
macos_urls = [
"https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
"https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
],
)

platform_http_file(
name = "org_mozilla_geckodriver",
amd64_sha256 =
"c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6",
amd64_urls = [
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
],
licenses = ["reciprocal"], # MPL 2.0
macos_sha256 =
"ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce",
macos_urls = [
"https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
"https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
],
)
""")
_browser_repositories(chromium = True, firefox = True)

0 comments on commit d8a0ccb

Please sign in to comment.