From 0658c60040c11d0575fbb0c5c963fcfa934da901 Mon Sep 17 00:00:00 2001 From: Yuan Tian Date: Mon, 20 Jan 2025 03:28:22 +0000 Subject: [PATCH 1/3] update the version --- web/versioned/browsers-0.3.4.bzl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/web/versioned/browsers-0.3.4.bzl b/web/versioned/browsers-0.3.4.bzl index b409ed6b..313d1e5c 100644 --- a/web/versioned/browsers-0.3.4.bzl +++ b/web/versioned/browsers-0.3.4.bzl @@ -186,7 +186,21 @@ def org_mozilla_firefox(): ) platform_archive( - name = "org_mozilla_firefox_macos", + name = "org_mozilla_firefox_macos_x64", + licenses = ["reciprocal"], # MPL 2.0 + sha256 = "c06c4e58179acaf55d05c3be41d0d4cdd68f811a75322a39557d91121aa2ef74", + # Firefox v97.0 + urls = [ + "https://ftp.mozilla.org/pub/firefox/releases/97.0/mac/en-US/Firefox%2097.0.dmg", + "https://storage.googleapis.com/dev-infra-mirror/firefox/97.0/mac_x64/browser-bin.dmg", + ], + named_files = { + "FIREFOX": "Firefox.app/Contents/MacOS/firefox", + }, + ) + + platform_archive( + name = "org_mozilla_firefox_macos_arm64", licenses = ["reciprocal"], # MPL 2.0 sha256 = "c06c4e58179acaf55d05c3be41d0d4cdd68f811a75322a39557d91121aa2ef74", # Firefox v97.0 From 76c45701f56a6aafbbef22f1c4db6569310b109f Mon Sep 17 00:00:00 2001 From: Yuan Tian Date: Thu, 23 Jan 2025 20:59:56 +0000 Subject: [PATCH 2/3] Update the default browser to use version 0.3.4 --- MODULE.bazel | 2 +- web/versioned/browsers-0.3.4.bzl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 94966961..86ea6e19 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -77,7 +77,7 @@ scala_deps.toolchains( ##### Browsers dependencies ##### browser_repositories = use_extension("//web:extension.bzl", "browser_repositories_extension") -browser_repositories.install(version = "0.3.3") +browser_repositories.install(version = "0.3.4") use_repo( browser_repositories, "com_saucelabs_sauce_connect_linux_x64", diff --git a/web/versioned/browsers-0.3.4.bzl b/web/versioned/browsers-0.3.4.bzl index 313d1e5c..27d2ebc3 100644 --- a/web/versioned/browsers-0.3.4.bzl +++ b/web/versioned/browsers-0.3.4.bzl @@ -200,6 +200,9 @@ def org_mozilla_firefox(): ) platform_archive( + # Firefox has a launcher that conditionally starts x64/arm64. This means that the + # x64 and arm64 repositories download the same binaries. We preserve separate + # repositories to allow for dedicated ARM/x64 binaries if needed in the future. name = "org_mozilla_firefox_macos_arm64", licenses = ["reciprocal"], # MPL 2.0 sha256 = "c06c4e58179acaf55d05c3be41d0d4cdd68f811a75322a39557d91121aa2ef74", From 48c476ab6529ec94444b5236fec082066c7f99f7 Mon Sep 17 00:00:00 2001 From: Yuan Tian Date: Thu, 23 Jan 2025 23:05:57 +0000 Subject: [PATCH 3/3] Bump scala version --- .bazelversion | 1 - MODULE.bazel | 54 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 10 deletions(-) delete mode 100644 .bazelversion diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index 815da58b..00000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -7.4.1 diff --git a/MODULE.bazel b/MODULE.bazel index 86ea6e19..fe70bb44 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,14 +3,31 @@ module( version = "0.4.0", ) -bazel_dep(name = "bazel_skylib", version = "1.7.1") -bazel_dep(name = "platforms", version = "0.0.10") +bazel_dep( + name = "bazel_skylib", + version = "1.7.1", +) + +bazel_dep( + name = "platforms", + version = "0.0.10", +) ##### Go dependencies ##### -bazel_dep(name = "rules_go", version = "0.51.0-rc1", repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.40.0", repo_name = "bazel_gazelle") +bazel_dep( + name = "rules_go", + version = "0.51.0-rc1", + repo_name = "io_bazel_rules_go", +) + +bazel_dep( + name = "gazelle", + version = "0.40.0", + repo_name = "bazel_gazelle", +) go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") + go_deps.from_file(go_mod = "//:go.mod") # All *direct* Go dependencies of the module have to be listed explicitly. @@ -21,9 +38,13 @@ use_repo( ) ##### Java dependencies ##### -bazel_dep(name = "rules_jvm_external", version = "6.6") +bazel_dep( + name = "rules_jvm_external", + version = "6.6", +) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") + maven.install( artifacts = [ "com.google.guava:guava:33.2.1-jre", @@ -32,35 +53,46 @@ maven.install( "junit:junit:4.13.2", ], ) + use_repo(maven, "maven") ##### Python dependencies ##### -bazel_dep(name = "rules_python", version = "1.0.0") +bazel_dep( + name = "rules_python", + version = "1.0.0", +) python = use_extension("@rules_python//python/extensions:python.bzl", "python") + python.toolchain( is_default = True, python_version = "3.11", ) + use_repo(python, "python_3_11", "python_versions") pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") + pip.parse( hub_name = "rules_webtesting_py_deps", python_version = "3.11", requirements_lock = "//:requirements_lock.txt", requirements_windows = "requirements_lock_windows.txt", ) + use_repo(pip, "rules_webtesting_py_deps") ##### Scala dependencies ##### -bazel_dep(name = "rules_scala", repo_name = "io_bazel_rules_scala") +bazel_dep( + name = "rules_scala", + repo_name = "io_bazel_rules_scala", +) # TODO: Switch to a release version once it's available in BCR. # Otherwise, the root module has to declare the same override. git_override( module_name = "rules_scala", - commit = "7fb52c7fc2ef8f7670feb73c0a9869715bdc40b8", + commit = "031fb0d3a63467d87f25397eb8e23faa57d1d3a6", remote = "https://github.com/mbland/rules_scala", ) @@ -68,16 +100,20 @@ scala_deps = use_extension( "@io_bazel_rules_scala//scala/extensions:deps.bzl", "scala_deps", ) + scala_deps.settings( fetch_sources = True, ) + scala_deps.toolchains( scalatest = True, ) ##### Browsers dependencies ##### browser_repositories = use_extension("//web:extension.bzl", "browser_repositories_extension") + browser_repositories.install(version = "0.3.4") + use_repo( browser_repositories, "com_saucelabs_sauce_connect_linux_x64", @@ -88,7 +124,7 @@ use_repo( "org_chromium_chromedriver_macos_x64", "org_chromium_chromedriver_windows_x64", "org_chromium_chromium_linux_x64", - "org_chromium_chromium_macos_arm64", # Only available in 0.3.3 + "org_chromium_chromium_macos_arm64", # Only available in 0.3.3 "org_chromium_chromium_macos_x64", "org_chromium_chromium_windows_x64", "org_mozilla_firefox_linux_x64",