Skip to content

Commit def4e92

Browse files
aguspeaguspe
committed
Try by modified the pinned browsers
1 parent f4e7b1a commit def4e92

File tree

3 files changed

+156
-157
lines changed

3 files changed

+156
-157
lines changed

‎common/repositories.bzl‎

Lines changed: 106 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file has been generated using `bazel run scripts:pinned_browsers`
1+
# This file has been generated using bazel run scripts:pinned_browsers
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("//common/private:deb_archive.bzl", "deb_archive")
@@ -11,8 +11,8 @@ def pin_browsers():
1111

1212
http_archive(
1313
name = "linux_firefox",
14-
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0/linux-x86_64/en-US/firefox-136.0.tar.xz",
15-
sha256 = "5222f51caacfccaf0f0cf795117f0ad37422fe9d413ef18f2c171e1622b9455a",
14+
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.1/linux-x86_64/en-US/firefox-136.0.1.tar.xz",
15+
sha256 = "326c3dadd05153a6825145c9200f48021e039593cd6d6c434abee326e6096835",
1616
build_file_content = """
1717
load("@aspect_rules_js//js:defs.bzl", "js_library")
1818
package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
3333

3434
dmg_archive(
3535
name = "mac_firefox",
36-
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0/mac/en-US/Firefox%20136.0.dmg",
37-
sha256 = "078559a33491b7c5ef5dcde62fe3c812835aae98b63a7e32b3bf7e33cb33fcc8",
36+
url = "https://ftp.mozilla.org/pub/firefox/releases/136.0.1/mac/en-US/Firefox%20136.0.1.dmg",
37+
sha256 = "416f5edf1e9fb938ccaea798adfe177ef7a4072c95a527cb460f3417d1ef5266",
3838
build_file_content = """
3939
load("@aspect_rules_js//js:defs.bzl", "js_library")
4040
package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
5050

5151
http_archive(
5252
name = "linux_beta_firefox",
53-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/linux-x86_64/en-US/firefox-137.0b2.tar.xz",
54-
sha256 = "cfacafd480c40e6e9756cd4e5128e82c690bc53aca9d9dbf7bcfc6f2cf437fd6",
53+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b6/linux-x86_64/en-US/firefox-137.0b6.tar.xz",
54+
sha256 = "c8348f336162709f8918178a3e11d2e70f91fbc82a8fb8839d45ffdee1c57367",
5555
build_file_content = """
5656
load("@aspect_rules_js//js:defs.bzl", "js_library")
5757
package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
7272

7373
dmg_archive(
7474
name = "mac_beta_firefox",
75-
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b2/mac/en-US/Firefox%20137.0b2.dmg",
76-
sha256 = "2038c5a761974ee521943986f82fee551de32d2e8839c1102c4bca70c5953bbb",
75+
url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b6/mac/en-US/Firefox%20137.0b6.dmg",
76+
sha256 = "1bd8bcef306aaa99e7595a9a5a8fb1df4c977fc661c815d33b7636fb48410154",
7777
build_file_content = """
7878
load("@aspect_rules_js//js:defs.bzl", "js_library")
7979
package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/bd7a7bb2-a585-4892-8cb1-74c91c53c943/MicrosoftEdge-134.0.3124.51.pkg",
127-
sha256 = "5aa1d2fd4e35a177e98cddaee8b3edeedf6e765aef5a09d3872de96d5760778c",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/652efb17-53e6-4847-a085-3db94160e488/MicrosoftEdge-134.0.3124.68.pkg",
127+
sha256 = "46a5de4b61594b4742d5f7809ec6045eef1a0f244c4bf846b4eea108e72c8776",
128128
move = {
129-
"MicrosoftEdge-134.0.3124.51.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-134.0.3124.68.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.51-1_amd64.deb",
147-
sha256 = "8bb0ba438b820599c8c9dd8b03e2b0b39fd6c4765aa33fd4c6037d02d642b6ea",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.68-1_amd64.deb",
147+
sha256 = "ce337cb2c55e477cb2c3e7bab55cdcaeb6242d3a28f119a6e068dc1bd8903299",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/133.0.3065.92/edgedriver_linux64.zip",
169-
sha256 = "a9f47b0e0fec42ca709705841b79746a4635464b202e5e205ee980d7984c1d2b",
168+
url = "https://msedgedriver.azureedge.net/134.0.3124.68/edgedriver_linux64.zip",
169+
sha256 = "ada55ec37b7b7206dfc0e208b9edd89308a26095c767a802475b933d492cb729",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/133.0.3065.92/edgedriver_mac64.zip",
186-
sha256 = "fc7bef50ec6edfb73a4b4792fa1b0aa3641a95ffa522bccd20422ee221ed225d",
185+
url = "https://msedgedriver.azureedge.net/134.0.3124.68/edgedriver_mac64.zip",
186+
sha256 = "fb699791bea79d0e5ba53d92e8745241124a5d476669bdae468db9b28da43b51",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.35/linux64/chrome-linux64.zip",
203-
sha256 = "7c11f4cb9620df17582509184106cef56a06b7ac37bc08c12d84a6fb367abc41",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/linux64/chrome-linux64.zip",
203+
sha256 = "99f05b875209cdbf7490dc431a525fd373788521fb9e8aca68c761fc5fc400e5",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.35/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "68644df4fd3ec2ab8e2e6918f49548b0b02284d0becf72754d2826a3349f38e7",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "d42a196a68b4d4fb7d096308df96f7b7311a316934200e842f7a30f93fb6ecdc",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.35/linux64/chromedriver-linux64.zip",
247-
sha256 = "b820be8f77e9b03eda7c68ee85263f58109b631f8e12e6e5d4fb580aeb1578dc",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/linux64/chromedriver-linux64.zip",
247+
sha256 = "58df717d51484b9f3ac188af5231cdc77255daa72d0b2b86481bee54e398ce2f",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,88 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.35/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "c7110fda39d2f1fea7d7471742a4078fa3f97c54415c410e57afb1c97c8fc93c",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.88/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "30b2ee9abdd73d56e0e1d390bf04fe1a14a88522b765b045b42b768c2be74738",
266+
strip_prefix = "chromedriver-mac-x64",
267+
build_file_content = """
268+
load("@aspect_rules_js//js:defs.bzl", "js_library")
269+
package(default_visibility = ["//visibility:public"])
270+
271+
exports_files(["chromedriver"])
272+
273+
js_library(
274+
name = "chromedriver-js",
275+
data = ["chromedriver"],
276+
)
277+
""",
278+
)
279+
280+
http_archive(
281+
name = "linux_beta_chrome",
282+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.17/linux64/chrome-linux64.zip",
283+
sha256 = "ff99e9ff5f4f1e67e8f0dc769a545ad9aeb73ed16c0febbfda13eb6902863055",
284+
build_file_content = """
285+
load("@aspect_rules_js//js:defs.bzl", "js_library")
286+
package(default_visibility = ["//visibility:public"])
287+
288+
filegroup(
289+
name = "files",
290+
srcs = glob(["**/*"]),
291+
)
292+
293+
exports_files(["chrome-linux64/chrome"])
294+
295+
js_library(
296+
name = "chrome-js",
297+
data = [":files"],
298+
)
299+
""",
300+
)
301+
302+
http_archive(
303+
name = "mac_beta_chrome",
304+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.17/mac-x64/chrome-mac-x64.zip",
305+
sha256 = "93ec418e05f3133f76a5a556b039227bee5c4a7997b94c4e67f8d8508f06a998",
306+
strip_prefix = "chrome-mac-x64",
307+
patch_cmds = [
308+
"mv 'Google Chrome for Testing.app' Chrome.app",
309+
"mv 'Chrome.app/Contents/MacOS/Google Chrome for Testing' Chrome.app/Contents/MacOS/Chrome",
310+
],
311+
build_file_content = """
312+
load("@aspect_rules_js//js:defs.bzl", "js_library")
313+
package(default_visibility = ["//visibility:public"])
314+
315+
exports_files(["Chrome.app"])
316+
317+
js_library(
318+
name = "chrome-js",
319+
data = glob(["Chrome.app/**/*"]),
320+
)
321+
""",
322+
)
323+
324+
http_archive(
325+
name = "linux_beta_chromedriver",
326+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.17/linux64/chromedriver-linux64.zip",
327+
sha256 = "67d418d1f2ffaefce77f3b9ad97ce5772db4095da2a7564934c09b80769e6d94",
328+
strip_prefix = "chromedriver-linux64",
329+
build_file_content = """
330+
load("@aspect_rules_js//js:defs.bzl", "js_library")
331+
package(default_visibility = ["//visibility:public"])
332+
333+
exports_files(["chromedriver"])
334+
335+
js_library(
336+
name = "chromedriver-js",
337+
data = ["chromedriver"],
338+
)
339+
""",
340+
)
341+
342+
http_archive(
343+
name = "mac_beta_chromedriver",
344+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.17/mac-x64/chromedriver-mac-x64.zip",
345+
sha256 = "13b78b1f19895d00e19dbb46d11264d52742832d175081b9d2931d3f71cf7c47",
266346
strip_prefix = "chromedriver-mac-x64",
267347
build_file_content = """
268348
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎rb/spec/tests.bzl‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ BROWSERS = {
4242
"WD_SPEC_DRIVER": "chrome-beta",
4343
} | select({
4444
"@selenium//common:use_pinned_linux_chrome": {
45-
"CHROME_BINARY": "$(location @linux_chrome//:chrome-linux64/chrome)",
46-
"CHROMEDRIVER_BINARY": "$(location @linux_chromedriver//:chromedriver)",
45+
"CHROME_BINARY": "$(location @linux_chrome_beta//:chrome-linux64/chrome)",
46+
"CHROMEDRIVER_BINARY": "$(location @linux_chromedriver_beta//:chromedriver)",
4747
},
4848
"@selenium//common:use_pinned_macos_chrome": {
49-
"CHROME_BINARY": "$(location @mac_chrome//:Chrome.app)/Contents/MacOS/Chrome",
50-
"CHROMEDRIVER_BINARY": "$(location @mac_chromedriver//:chromedriver)",
49+
"CHROME_BINARY": "$(location @mac_chrome_beta//:Chrome.app)/Contents/MacOS/Chrome",
50+
"CHROMEDRIVER_BINARY": "$(location @mac_chromedriver_beta//:chromedriver)",
5151
},
5252
"//conditions:default": {},
5353
}) | select({
@@ -128,7 +128,7 @@ BROWSERS = {
128128
"data": [],
129129
"deps": ["//rb/lib/selenium/webdriver:ie"],
130130
"tags": [
131-
"skip-remote", # RBE is Linux-only.
131+
"skip-remote",
132132
],
133133
"target_compatible_with": ["@platforms//os:windows"],
134134
"env": {
@@ -140,8 +140,8 @@ BROWSERS = {
140140
"data": [],
141141
"deps": ["//rb/lib/selenium/webdriver:safari"],
142142
"tags": [
143-
"exclusive-if-local", # Safari cannot run in parallel.
144-
"skip-remote", # RBE is Linux-only.
143+
"exclusive-if-local",
144+
"skip-remote",
145145
],
146146
"target_compatible_with": ["@platforms//os:macos"],
147147
"env": {
@@ -153,8 +153,8 @@ BROWSERS = {
153153
"data": [],
154154
"deps": ["//rb/lib/selenium/webdriver:safari"],
155155
"tags": [
156-
"exclusive-if-local", # Safari cannot run in parallel.
157-
"skip-remote", # RBE is Linux-only.
156+
"exclusive-if-local",
157+
"skip-remote",
158158
],
159159
"target_compatible_with": ["@platforms//os:macos"],
160160
"env": {
@@ -165,15 +165,12 @@ BROWSERS = {
165165
}
166166

167167
def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.keys(), tags = []):
168-
# Generate a library target that is used by //rb/spec:spec to expose all tests to //rb:lint.
169168
rb_library(
170169
name = name,
171170
srcs = srcs,
172171
visibility = ["//rb:__subpackages__"],
173172
)
174-
175173
for browser in browsers:
176-
# Generate a test target for local browser execution.
177174
rb_test(
178175
name = "{}-{}".format(name, browser),
179176
size = "large",
@@ -187,8 +184,6 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
187184
visibility = ["//rb:__subpackages__"],
188185
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
189186
)
190-
191-
# Generate a test target for remote browser execution (Grid).
192187
rb_test(
193188
name = "{}-{}-remote".format(name, browser),
194189
size = "large",
@@ -210,8 +205,6 @@ def rb_integration_test(name, srcs, deps = [], data = [], browsers = BROWSERS.ke
210205
visibility = ["//rb:__subpackages__"],
211206
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
212207
)
213-
214-
# Generate a test target for bidi browser execution.
215208
rb_test(
216209
name = "{}-{}-bidi".format(name, browser),
217210
size = "large",
@@ -238,7 +231,7 @@ def rb_unit_test(name, srcs, deps, data = []):
238231
args = ["rb/spec/"],
239232
main = "@bundle//bin:rspec",
240233
data = data,
241-
tags = ["no-sandbox"], # TODO: Do we need this?
234+
tags = ["no-sandbox"],
242235
deps = ["//rb/spec/unit/selenium/webdriver:spec_helper"] + deps,
243236
visibility = ["//rb:__subpackages__"],
244237
)

0 commit comments

Comments
 (0)