Skip to content

Commit

Permalink
Merge branch 'trunk' into sm_full_browser_version
Browse files Browse the repository at this point in the history
  • Loading branch information
bonigarcia authored Nov 18, 2024
2 parents 118f6fc + 9054e89 commit 239d8f3
Show file tree
Hide file tree
Showing 889 changed files with 20,566 additions and 7,158 deletions.
2 changes: 1 addition & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
changelog:
exclude:
labels:
-dependencies
- dependencies
authors:
- selenium-ci
6 changes: 3 additions & 3 deletions .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 == 'macos' && 'macos-13' || format('{0}-latest', inputs.os) }}
runs-on: ${{ format('{0}-latest', inputs.os) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
node-version: ${{ inputs.node-version }}
- name: Setup Bazel with caching
if: inputs.caching
uses: bazel-contrib/setup-bazel@0.8.5
uses: bazel-contrib/setup-bazel@0.9.1
with:
bazelisk-cache: true
bazelrc: common --color=yes
Expand All @@ -130,7 +130,7 @@ jobs:
repository-cache: true
- name: Setup Bazel without caching
if: inputs.caching == false
uses: bazel-contrib/setup-bazel@0.8.5
uses: bazel-contrib/setup-bazel@0.9.1
with:
bazelrc: common --color=yes
- name: Setup Fluxbox and Xvfb
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ jobs:
java-version: 17
os: windows
run: |
fsutil 8dot3name set 0
bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true
1 change: 1 addition & 0 deletions .github/workflows/ci-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
# https://github.com/bazelbuild/rules_jvm_external/issues/1046
java-version: 17
run: |
fsutil 8dot3name set 0
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `
Expand Down
42 changes: 36 additions & 6 deletions .github/workflows/ci-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
docs:
name: Documentation
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout source tree
uses: actions/checkout@v4
Expand All @@ -36,7 +36,7 @@ jobs:
lint:
name: Lint
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout source tree
uses: actions/checkout@v4
Expand All @@ -58,7 +58,7 @@ jobs:
mypy:
name: Mypy
needs: build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout source tree
uses: actions/checkout@v4
Expand All @@ -81,8 +81,38 @@ jobs:
name: Remote Tests
needs: build
uses: ./.github/workflows/bazel.yml
strategy:
fail-fast: false
matrix:
include:
- browser: firefox
with:
name: Integration Tests (remote)
browser: firefox
cache-key: py-remote
name: Integration Tests (remote, ${{ matrix.browser }})
browser: ${{ matrix.browser }}
cache-key: py-remote-${{ matrix.browser }}
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote

browser-tests:
name: Browser Tests
needs: build
uses: ./.github/workflows/bazel.yml
strategy:
fail-fast: false
matrix:
include:
- browser: safari
os: macos
- browser: chrome
os: ubuntu
- browser: edge
os: ubuntu
- browser: firefox
os: ubuntu
with:
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
browser: ${{ matrix.browser }}
os: ${{ matrix.os }}
cache-key: py-browser-${{ matrix.browser }}
run: |
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
4 changes: 2 additions & 2 deletions .github/workflows/ci-rbe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
name: Check format script run
caching: false
ruby-version: jruby-9.4.5.0
ruby-version: jruby-9.4.8.0
run: ./scripts/github-actions/check-format.sh

test:
Expand All @@ -25,5 +25,5 @@ jobs:
with:
name: All RBE tests
caching: false
ruby-version: jruby-9.4.5.0
ruby-version: jruby-9.4.8.0
run: ./scripts/github-actions/ci-build.sh
12 changes: 6 additions & 6 deletions .github/workflows/ci-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ jobs:
fail-fast: false
matrix:
include:
- ruby-version: 3.0.6
- ruby-version: 3.1.6
os: ubuntu
- ruby-version: 3.0.6
- ruby-version: 3.1.6
os: windows
- ruby-version: 3.0.6
- ruby-version: 3.1.6
os: macos
- ruby-version: 3.3.0
- ruby-version: 3.3.5
os: ubuntu
- ruby-version: jruby-9.4.5.0
- ruby-version: jruby-9.4.8.0
os: ubuntu
- ruby-version: truffleruby-23.1.1
- ruby-version: truffleruby-24.1.1
os: ubuntu
with:
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
fetch-depth: 50
- name: Setup Bazel
uses: bazel-contrib/setup-bazel@0.8.5
uses: bazel-contrib/setup-bazel@0.9.1
with:
bazelisk-cache: true
cache-version: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label-commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
comment:
if: github.repository_owner == 'seleniumhq'
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Label Commenter
Expand Down
2 changes: 2 additions & 0 deletions .skipped-tests
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
-//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py
-//py:test-edge-test/selenium/webdriver/edge/edge_launcher_tests.py
-//py:test-edge-test/selenium/webdriver/edge/edge_service_tests.py
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
Expand Down
5 changes: 5 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Ashley Trinh <itsashley@hey.com>
Aslak Hellesøy <aslak.hellesoy@gmail.com>
asmundak <asmundak@google.com>
Atsushi Tatsuma <yoshoku@outlook.com>
Augustin Gottlieb <33221555+aguspe@users.noreply.github.com>
Augustin Gottlieb Pequeno <33221555+aguspe@users.noreply.github.com>
Aurélien Pupier <apupier@redhat.com>
Austin Michael Wilkins <42476341+amwilkins@users.noreply.github.com>
Expand All @@ -106,6 +107,7 @@ bgermann <bage@debian.org>
bhecquet <bhecquet@users.noreply.github.com>
bhkwan <bhkwan@example.com>
Bill Agee <billagee@gmail.com>
BlitzDestroyer <143762104+BlitzDestroyer@users.noreply.github.com>
bob <bob@example.com>
Bob Baron <rdbaron@gmail.com>
Bob Lubecker <thebobalu@gmail.com>
Expand Down Expand Up @@ -199,6 +201,7 @@ Darrin Cherry <darrinlc@Gmail.com>
Dave Hoover <dave.hoover@gmail.com>
Dave Hunt <dave.hunt@gmail.com>
daviande <danderso@gmail.com>
David Bernhard <dbernhard@ethz.ch>
David Burns <david.burns@theautomatedtester.co.uk>
David English <davidenglishcodes@gmail.com>
David Fischer <david.fischer.ch@gmail.com>
Expand Down Expand Up @@ -696,6 +699,7 @@ PombaM <PombaM@users.noreply.github.com>
Potapov Dmitriy <potapovd3012@gmail.com>
Prakhar Rawat <pxr7185@g.rit.edu>
praveendvd <45095911+praveendvd@users.noreply.github.com>
Priyansh Garg <priyanshgarg30@gmail.com>
Puja Jagani <puja.jagani93@gmail.com>
Pulkit Sharma <avastpulkit@gmail.com>
Pydi Chandra <pydi.chandra@gmail.com>
Expand All @@ -719,6 +723,7 @@ richard.hines <richard.hines@hp.com>
RichCrook <richcrook@yahoo.com>
richseviora <richard.seviora@gmail.com>
Rishav Trivedi <rishabtrivedi87@gmail.com>
Rob Brackett <rob@robbrackett.com>
Rob Richardson <robrich@robrich.org>
Rob Wu <gwnRob@gmail.com>
Robert Elliot <rob@lidalia.org.uk>
Expand Down
Loading

0 comments on commit 239d8f3

Please sign in to comment.