Skip to content

Commit

Permalink
Merge branch 'trunk' into node-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
VietND96 authored Apr 26, 2024
2 parents 2c9ff73 + 6ece8d7 commit 2eac37a
Show file tree
Hide file tree
Showing 81 changed files with 1,348 additions and 807 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ on:
jobs:
bazel:
name: ${{ inputs.name }}
runs-on: ${{ inputs.os }}-latest
runs-on: ${{ inputs.os == 'macos' && 'macos-13' || format('{0}-latest', inputs.os) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ jobs:
os: ubuntu
- browser: safari
os: windows
# TODO: Investigate why they are timing out
- browser: chrome
os: windows
- browser: edge
os: windows
with:
name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
browser: ${{ matrix.browser }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:

javascript:
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'javascript' || github.event_name == 'schedule')
name: DotNet
name: JavaScript
uses: ./.github/workflows/bazel.yml
with:
name: Nightly JavaScript Release
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
with:
ruby-version: '3.1'
working-directory: 'rb'
- name: "Prep git"
run: |
git config --local user.email "[email protected]"
Expand All @@ -89,10 +90,11 @@ jobs:
token: ${{ secrets.SELENIUM_CI_TOKEN }}
author: Selenium CI Bot <[email protected]>
delete-branch: true
branch: release-preparation-${{ github.event.inputs.version }}
title: "[build] Prepare for release of Selenium ${{ github.event.inputs.version }}"
body: |
**Warning: Manually update the changelogs before merging**
This PR:
* Updates Rust version for Selenium Manager release
* Updates Pinned browser version to coincide with new CDP release
Expand All @@ -102,9 +104,9 @@ jobs:
* Adds new authors to authors file
* Updates all versions for all bindings
* Generates *rough* change logs for each bindings (please tidy them up before merging this)
- Auto-generated by [create-pull-request][1]
[1]: https://github.com/peter-evans/create-pull-request
labels: C-build
draft: true
1 change: 1 addition & 0 deletions .skipped-tests
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
-//rb/spec/integration/selenium/webdriver/edge:service-edge
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
-//rb/spec/integration/selenium/webdriver:element-chrome
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,7 @@ Sankha Narayan Guria <[email protected]>
Santiago Suarez Ordoñez <[email protected]>
Sarah Bird <[email protected]>
Sayyid Ali Sajjad Rizavi <[email protected]>
schrufygroovy <[email protected]>
Scott Babcock <[email protected]>
Scott Sauber <[email protected]>
Scott Stevens <[email protected]>
Expand Down Expand Up @@ -768,6 +769,7 @@ smhc <[email protected]>
Snail <[email protected]>
space88man <[email protected]>
Sri Harsha <[email protected]>
Sri Harsha <[email protected]>
sridharUpputuri <[email protected]>
Srinivasan Sekar <[email protected]>
Sripathi Pai <[email protected]>
Expand Down
85 changes: 43 additions & 42 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -155,45 +155,45 @@ maven.install(
name = "maven",
artifacts = [
"com.beust:jcommander:1.82",
"com.github.javaparser:javaparser-core:3.25.8",
"com.github.spotbugs:spotbugs:4.8.3",
"com.github.javaparser:javaparser-core:3.25.10",
"com.github.spotbugs:spotbugs:4.8.4",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
"com.google.code.gson:gson:2.10.1",
"com.google.guava:guava:33.0.0-jre",
"com.google.guava:guava:33.1.0-jre",
"com.google.auto:auto-common:1.2.2",
"com.google.auto.service:auto-service:1.1.1",
"com.google.auto.service:auto-service-annotations:1.1.1",
"com.google.googlejavaformat:google-java-format:jar:1.19.2",
"com.google.googlejavaformat:google-java-format:jar:1.22.0",
"com.graphql-java:graphql-java:20.2",
"com.graphql-java:java-dataloader:3.2.0",
"dev.failsafe:failsafe:3.3.2",
"io.grpc:grpc-context:1.61.1",
"io.lettuce:lettuce-core:6.3.1.RELEASE",
"io.netty:netty-buffer:4.1.107.Final",
"io.netty:netty-codec-http:4.1.107.Final",
"io.netty:netty-codec-http2:4.1.107.Final",
"io.netty:netty-common:4.1.107.Final",
"io.netty:netty-handler:4.1.107.Final",
"io.netty:netty-handler-proxy:4.1.107.Final",
"io.netty:netty-transport:4.1.107.Final",
"io.opentelemetry:opentelemetry-api:1.35.0",
"io.opentelemetry:opentelemetry-context:1.35.0",
"io.opentelemetry:opentelemetry-exporter-logging:1.35.0",
"io.opentelemetry:opentelemetry-sdk:1.35.0",
"io.opentelemetry:opentelemetry-sdk-common:1.35.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.35.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.35.0",
"io.opentelemetry:opentelemetry-sdk-testing:1.35.0",
"io.opentelemetry:opentelemetry-sdk-trace:1.35.0",
"io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha",
"io.grpc:grpc-context:1.63.0",
"io.lettuce:lettuce-core:6.3.2.RELEASE",
"io.netty:netty-buffer:4.1.109.Final",
"io.netty:netty-codec-http:4.1.109.Final",
"io.netty:netty-codec-http2:4.1.109.Final",
"io.netty:netty-common:4.1.109.Final",
"io.netty:netty-handler:4.1.109.Final",
"io.netty:netty-handler-proxy:4.1.109.Final",
"io.netty:netty-transport:4.1.109.Final",
"io.opentelemetry:opentelemetry-api:1.37.0",
"io.opentelemetry:opentelemetry-context:1.37.0",
"io.opentelemetry:opentelemetry-exporter-logging:1.37.0",
"io.opentelemetry:opentelemetry-sdk:1.37.0",
"io.opentelemetry:opentelemetry-sdk-common:1.37.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.37.0",
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.37.0",
"io.opentelemetry:opentelemetry-sdk-testing:1.37.0",
"io.opentelemetry:opentelemetry-sdk-trace:1.37.0",
"io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
"io.ous:jtoml:2.0.0",
"it.ozimov:embedded-redis:0.7.3",
"net.bytebuddy:byte-buddy:1.14.12",
"org.htmlunit:htmlunit-core-js:3.11.0",
"org.apache.commons:commons-exec:1.3",
"org.apache.logging.log4j:log4j-core:2.22.1",
"net.bytebuddy:byte-buddy:1.14.14",
"org.htmlunit:htmlunit-core-js:4.0.0",
"org.apache.commons:commons-exec:1.4.0",
"org.apache.logging.log4j:log4j-core:2.23.1",
"org.assertj:assertj-core:3.25.3",
"org.bouncycastle:bcpkix-jdk18on:1.77",
"org.bouncycastle:bcpkix-jdk18on:1.78.1",
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
"org.hsqldb:hsqldb:2.7.2",
"org.junit.jupiter:junit-jupiter-api:5.10.2",
Expand All @@ -203,11 +203,11 @@ maven.install(
"org.junit.platform:junit-platform-reporting:1.10.2",
"org.junit.platform:junit-platform-commons:1.10.2",
"org.junit.platform:junit-platform-engine:1.10.2",
"org.mockito:mockito-core:5.10.0",
"org.mockito:mockito-core:5.11.0",
"org.mockito:mockito-inline:5.2.0",
"org.redisson:redisson:3.26.1",
"org.slf4j:slf4j-api:2.0.12",
"org.slf4j:slf4j-jdk14:2.0.12",
"org.redisson:redisson:3.29.0",
"org.slf4j:slf4j-api:2.0.13",
"org.slf4j:slf4j-jdk14:2.0.13",
"org.zeromq:jeromq:0.6.0",
],
excluded_artifacts = [
Expand All @@ -224,7 +224,7 @@ maven.install(
],
strict_visibility = True,
)
use_repo(maven, "maven")
use_repo(maven, "maven", "unpinned_maven")

ruby = use_extension("@rules_ruby//ruby:extensions.bzl", "ruby")
ruby.toolchain(
Expand All @@ -251,7 +251,7 @@ ruby.bundle_fetch(
"connection_pool-2.4.1": "0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4",
"crack-1.0.0": "c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49",
"csv-3.3.0": "0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d",
"debug-1.9.1": "86f1a6d4a299184f1a1f7ae4c2fe80f178beed55cdf608f83b49d7bdefa3ffda",
"debug-1.9.2": "48e026c0852c7a10c60263e2e527968308958e266231e36d64e3efcabec7e7fc",
"diff-lcs-1.5.1": "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe",
"drb-2.2.1": "e9d472bf785f558b96b25358bae115646da0dbfd45107ad858b0bc0d935cb340",
"ffi-1.16.3": "6d3242ff10c87271b0675c58d68d3f10148fabc2ad6da52a18123f06078871fb",
Expand All @@ -265,8 +265,8 @@ ruby.bundle_fetch(
"io-console-0.7.2-java": "73aa382f8832b116613ceaf57b8ff5bf73dfedcaf39f0aa5420e10f63a4543ed",
"irb-1.12.0": "07634937fbb7d28d07e46da50d0aa43b4d2f7258174d08de4e32dfb57c10539d",
"jar-dependencies-0.4.1": "b2df2f1ecbff15334ce20ea7fdd5b8d8161faab67761ff72c7647d728e40d387",
"json-2.7.1": "187ea312fb58420ff0c40f40af1862651d4295c8675267c6a1c353f1a0ac3265",
"json-2.7.1-java": "bfd628c0f8357058c2cf848febfa6f140f70f94ec492693a31a0a1933038a61b",
"json-2.7.2": "1898b5cbc81cd36c0fd4d0b7ad2682c39fb07c5ff682fc6265f678f550d4982c",
"json-2.7.2-java": "138e3038b5361b3d06ee2e8aa2be00bed0d0de4ef5f1553fc5935e5b93aca7ee",
"language_server-protocol-3.17.0.3": "3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f",
"listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67",
"logger-1.6.0": "0ab7c120262dd8de2a18cb8d377f1f318cbe98535160a508af9e7710ff43ef3e",
Expand All @@ -276,31 +276,32 @@ ruby.bundle_fetch(
"parser-3.3.0.5": "7748313e505ca87045dc0465c776c802043f777581796eb79b1654c5d19d2687",
"psych-5.1.2": "337322f58fc2bf24827d2b9bd5ab595f6a72971867d151bb39980060ea40a368",
"psych-5.1.2-java": "1dd68dc609eddbc884e6892e11da942e16f7256bd30ebde9d35449d43043a6fe",
"public_suffix-5.0.4": "35cd648e0d21d06b8dce9331d19619538d1d898ba6d56a6f2258409d2526d1ae",
"public_suffix-5.0.5": "72c340218bb384610536919988705cc29e09749c0021fd7005f715c7e5dfc493",
"racc-1.7.3": "b785ab8a30ec43bce073c51dbbe791fd27000f68d1c996c95da98bf685316905",
"racc-1.7.3-java": "b2ad737e788cfa083263ce7c9290644bb0f2c691908249eb4f6eb48ed2815dbf",
"rack-2.2.9": "fd6301a97a1c1e955e68f85c861fcb1cde6145a32c532e1ea321a72ff8cc4042",
"rainbow-3.1.1": "039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a",
"rake-13.1.0": "be6a3e1aa7f66e6c65fa57555234eb75ce4cf4ada077658449207205474199c6",
"rake-13.2.1": "46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d",
"rb-fsevent-0.11.2": "43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe",
"rb-inotify-0.10.1": "050062d4f31d307cca52c3f6a7f4b946df8de25fc4bd373e1a5142e41034a7ca",
"rbs-3.4.4": "1376d2604a00832641bb47521595e63a1c0d1cc241ded383ba48ddb4396de5a8",
"rchardet-1.8.0": "693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7",
"rdoc-6.6.3.1": "39f7b749229ab5ad9d21c81586151c1dd7a549fa8be4070ee09b524f9c656345",
"regexp_parser-2.9.0": "81a00ba141cec0d4b4bf58cb80cd9193e5180836d3fa6ef623f7886d3ba8bdd9",
"reline-0.5.0": "2c4d4570a3fe730225d62e07ec2ad4c5726d8f211b240cf8f8c648ed006d26b7",
"reline-0.5.3": "2c46747a1dfd03e100f0666d8a374cf2930c3e734298af9b39e5fe8d35b42035",
"rexml-3.2.6": "e0669a2d4e9f109951cb1fde723d8acd285425d81594a2ea929304af50282816",
"rspec-3.13.0": "d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993",
"rspec-core-3.13.0": "557792b4e88da883d580342b263d9652b6a10a12d5bda9ef967b01a48f15454c",
"rspec-expectations-3.13.0": "621d48c62262f955421eaa418130744760802cad47e781df70dba4d9f897102e",
"rspec-mocks-3.13.0": "735a891215758d77cdb5f4721fffc21078793959d1f0ee4a961874311d9b7f66",
"rspec-support-3.13.1": "48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f",
"rubocop-1.62.1": "aeb1ec501aef5833617b3b6a1512303806218c349c28ce5b3ea72e3782ad4a35",
"rubocop-1.63.3": "17a31f16658f2fbb20bc7bcb4a841a06f7368da4f3be8a50365ad61e658d5f44",
"rubocop-ast-1.31.2": "7c206fb094553779923eca862aceece3913ce384f1bf85730208228e884578ec",
"rubocop-capybara-2.20.0": "2a6844b942921f230ee3ab8c94fe77f41a9406096a140245270c0e11624bb938",
"rubocop-factory_bot-2.25.1": "62751bde7af789878b8a31cbd2a82e69515ce7b23a2ad1820cb0fcc3e0150134",
"rubocop-performance-1.20.2": "1bb1fa8c427fac7ba3c8dd2decb9860f23cb2d6c40350bedc88538de8875c731",
"rubocop-rspec-2.27.1": "2f27ce04700be75db65afe83d7993a36e0fafd07ec062222f4b3cc10137a7a9e",
"rubocop-performance-1.21.0": "ec54fa8991c2d538af7bc958361d63bdb3df2e53032da393e9903ea5e4f74a9a",
"rubocop-rspec-2.29.1": "534ee81a3006e7379ec6203687ef7c06ca1d137b7d6d67c2777b680b1ce82e13",
"rubocop-rspec_rails-2.28.3": "9769f2077cca8af2269193ba0450e0317ae1827a132c19149fdbeecaaca32818",
"ruby-progressbar-1.13.0": "80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33",
"rubyzip-2.3.2": "3f57e3935dc2255c414484fbf8d673b4909d8a6a57007ed754dde39342d2373f",
"securerandom-0.3.1": "98f0450c0ea46d2f9a4b6db4f391dbd83dc08049592eada155739f40e0341bde",
Expand Down
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ JAVA_RELEASE_TARGETS = %w[
//java/src/org/openqa/selenium/chromium:chromium.publish
//java/src/org/openqa/selenium/devtools/v122:v122.publish
//java/src/org/openqa/selenium/devtools/v123:v123.publish
//java/src/org/openqa/selenium/devtools/v121:v121.publish
//java/src/org/openqa/selenium/devtools/v124:v124.publish
//java/src/org/openqa/selenium/devtools/v85:v85.publish
//java/src/org/openqa/selenium/edge:edge.publish
//java/src/org/openqa/selenium/firefox:firefox.publish
Expand Down Expand Up @@ -798,7 +798,7 @@ namespace :rb do
File.open(file, "w") { |f| f.puts text }

Rake::Task['rb:changelog'].invoke unless new_version.include?('nightly')
sh 'cd rb && bundle update'
sh 'cd rb && bundle --version && bundle update'
end

desc 'Update Ruby Syntax'
Expand Down Expand Up @@ -974,7 +974,7 @@ namespace :java do
args = ['--action_env=RULES_JVM_EXTERNAL_REPIN=1']
Bazel.execute('run', args, '@unpinned_maven//:pin')

file_path = 'java/maven_deps.bzl'
file_path = 'MODULE.bazel'
content = File.read(file_path)
# For some reason ./go wrapper is not outputting from Open3, so cannot use Bazel class directly
output = `bazel run @maven//:outdated`
Expand Down
6 changes: 5 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ http_archive(

load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains")

rules_closure_dependencies()
rules_closure_dependencies(
omit_rules_java = True,
omit_rules_proto = True,
omit_rules_python = True,
)

rules_closure_toolchains()

Expand Down
File renamed without changes.
Loading

0 comments on commit 2eac37a

Please sign in to comment.