Skip to content

Commit 758fbbb

Browse files
authored
Merge branch 'trunk' into relax-ruby-base64-dependency-version
2 parents 78123a6 + 8ccf021 commit 758fbbb

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

common/repositories.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/130.0.2849.56/edgedriver_linux64.zip",
169-
sha256 = "c5aa82d87750a6f49b741790a432194ff91d0a232c54eb5507a526f45146f440",
168+
url = "https://msedgedriver.azureedge.net/130.0.2849.46/edgedriver_linux64.zip",
169+
sha256 = "6a62b28e9373776ae7d3f6611f5dd126c454d73264c2bb826659d3283da57f27",
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/130.0.2849.56/edgedriver_mac64.zip",
186-
sha256 = "97141db0a53b22356094ff4d7a806a19ab816499366539e633a32fc4af8da2a3",
185+
url = "https://msedgedriver.azureedge.net/130.0.2849.61/edgedriver_mac64.zip",
186+
sha256 = "82e761138b112bd57950f6b873d601cd4b1e9c8403663c0ffaad8e5b167efc17",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])

scripts/pinned_browsers.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,15 @@ def edge():
261261

262262

263263
def edgedriver():
264-
r = http.request("GET", "https://msedgedriver.azureedge.net/LATEST_STABLE")
265-
v = r.data.decode("utf-16").strip()
264+
r_stable = http.request("GET", "https://msedgedriver.azureedge.net/LATEST_STABLE")
265+
stable_version = r_stable.data.decode("utf-16").strip()
266+
major_version = stable_version.split('.')[0]
267+
r = http.request("GET", f"https://msedgedriver.azureedge.net/LATEST_RELEASE_{major_version}_LINUX")
268+
linux_version = r.data.decode("utf-16").strip()
266269

267270
content = ""
268271

269-
linux = "https://msedgedriver.azureedge.net/%s/edgedriver_linux64.zip" % v
272+
linux = "https://msedgedriver.azureedge.net/%s/edgedriver_linux64.zip" % linux_version
270273
sha = calculate_hash(linux)
271274
content = (
272275
content
@@ -291,7 +294,9 @@ def edgedriver():
291294
% (linux, sha)
292295
)
293296

294-
mac = "https://msedgedriver.azureedge.net/%s/edgedriver_mac64.zip" % v
297+
r = http.request("GET", f"https://msedgedriver.azureedge.net/LATEST_RELEASE_{major_version}_MACOS")
298+
macos_version = r.data.decode("utf-16").strip()
299+
mac = "https://msedgedriver.azureedge.net/%s/edgedriver_mac64.zip" % macos_version
295300
sha = calculate_hash(mac)
296301
content = (
297302
content

0 commit comments

Comments
 (0)