Skip to content

Commit 8e9763c

Browse files
nvborisenkonvborisenko
committed
Merge remote-tracking branch 'upstream/trunk' into dotnet-bidi-browsingcontext
2 parents 90aa4c1 + ff1ddd7 commit 8e9763c

File tree

267 files changed

+6918
-3729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+6918
-3729
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
deploy:
1010
if: contains(toJson(github.event.commits), '[deploy site]') == true
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout repo
1414
uses: actions/checkout@v4

‎.github/workflows/dotnet-examples.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
if: matrix.release == 'nightly' && matrix.os != 'windows'
6262
run:
6363
|
64-
latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
64+
pip install -r ./scripts/requirements.txt
65+
latest_nightly=$(python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver)
66+
echo $latest_nightly
6567
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
6668
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
6769
env:
@@ -71,7 +73,8 @@ jobs:
7173
shell: pwsh
7274
run:
7375
|
74-
$latest_nightly = ./scripts/latest-nightly-version.ps1 nuget Selenium.WebDriver
76+
pip install -r ./scripts/requirements.txt
77+
$latest_nightly = python ./scripts/latest-nightly-version.py nuget Selenium.WebDriver
7578
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
7679
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
7780
env:

‎.github/workflows/java-examples.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,43 +45,50 @@ jobs:
4545
if: matrix.os == 'ubuntu'
4646
run: Xvfb :99 &
4747
- name: Set up Java
48+
id: java
4849
uses: actions/setup-java@v4
4950
with:
5051
distribution: 'temurin'
51-
java-version: 11
52+
java-version: 17
53+
- name: Import test cert non-Windows
54+
if: matrix.os != 'windows'
55+
run: sudo keytool -import -noprompt -trustcacerts -alias SeleniumHQ -file examples/java/src/test/resources/tls.crt -keystore ${{ steps.java.outputs.path }}/lib/security/cacerts -storepass changeit
56+
- name: Import test cert Windows
57+
if: matrix.os == 'windows'
58+
run: keytool -import -noprompt -trustcacerts -alias SeleniumHQ -file examples/java/src/test/resources/tls.crt -keystore ${{ steps.java.outputs.path }}/lib/security/cacerts -storepass changeit
5259
- name: Run Tests Stable
5360
if: matrix.release == 'stable'
5461
uses: nick-invision/[email protected]
5562
with:
56-
timeout_minutes: 20
63+
timeout_minutes: 40
5764
max_attempts: 3
5865
command: |
5966
cd examples/java
60-
mvn -B test
67+
mvn -B test -D"jdk.internal.httpclient.disableHostnameVerification=true"
6168
- name: Run Tests Nightly Linux/macOS
6269
if: matrix.release == 'nightly' && matrix.os != 'windows'
6370
uses: nick-invision/[email protected]
6471
with:
65-
timeout_minutes: 20
72+
timeout_minutes: 40
6673
max_attempts: 3
6774
command: |
6875
pip install yq
6976
xml_content=$(curl -sf https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/)
7077
latest_snapshot=$(echo "$xml_content" | xq '.content.data."content-item"' | jq -r 'sort_by(.lastModified) | last | .text')
7178
echo "Latest Selenium Snapshot: $latest_snapshot"
7279
cd examples/java
73-
mvn -B -U test -Dselenium.version="$latest_snapshot"
80+
mvn -B -U test -D"jdk.internal.httpclient.disableHostnameVerification=true"
7481
7582
- name: Run Tests Nightly Windows
7683
if: matrix.release == 'nightly' && matrix.os == 'windows'
7784
uses: nick-invision/[email protected]
7885
with:
79-
timeout_minutes: 20
86+
timeout_minutes: 40
8087
max_attempts: 3
8188
command: |
8289
pip install yq
8390
$xml_content = Invoke-WebRequest -Uri "https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/"
8491
$latest_snapshot = $xml_content.Content | xq '.content.data.\"content-item\"' | jq -r 'sort_by(.lastModified) | last | .text'
8592
Write-Output "Latest Selenium Snapshot: $latest_snapshot"
8693
cd examples/java
87-
mvn -B -U test "-Dselenium.version=$latest_snapshot"
94+
mvn -B -U test -D"jdk.internal.httpclient.disableHostnameVerification=true"

‎.github/workflows/js-examples.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ jobs:
9393
if: matrix.release == 'nightly' && matrix.os != 'windows'
9494
run:
9595
|
96-
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
96+
pip install -r ./scripts/requirements.txt
97+
latest_nightly=$(python ./scripts/latest-nightly-version.py npm selenium-webdriver)
98+
echo $latest_nightly
9799
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
98100
env:
99101
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -102,7 +104,8 @@ jobs:
102104
if: matrix.release == 'nightly' && matrix.os == 'windows'
103105
run:
104106
|
105-
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
107+
pip install -r ./scripts/requirements.txt
108+
$latest_nightly = python ./scripts/latest-nightly-version.py npm selenium-webdriver
106109
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
107110
env:
108111
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/label-commenter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
jobs:
1313
comment:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Label Commenter

‎.github/workflows/link-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Link check
4444
continue-on-error: true # <- If set to false, run fails with broken links
45-
uses: untitaker/[email protected].32
45+
uses: untitaker/[email protected].43
4646
with:
4747
args: website_and_docs/public/ --check-anchors
4848

‎.github/workflows/python-examples.yml‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,25 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ ubuntu, windows, macos ]
29-
release: [ stable, nightly ]
28+
include:
29+
- os: ubuntu
30+
release: stable
31+
python: '3.8'
32+
- os: ubuntu
33+
release: nightly
34+
python: '3.11'
35+
- os: windows
36+
release: stable
37+
python: '3.9'
38+
- os: windows
39+
release: nightly
40+
python: '3.12'
41+
- os: macos
42+
release: stable
43+
python: '3.10'
44+
- os: macos
45+
release: nightly
46+
python: '3.13'
3047
runs-on: ${{ format('{0}-latest', matrix.os) }}
3148
steps:
3249
- name: Checkout GitHub repo
@@ -47,14 +64,25 @@ jobs:
4764
- name: Set up Python
4865
uses: actions/setup-python@v5
4966
with:
50-
python-version: 3.8
51-
- name: Install dependencies nightly
52-
if: matrix.release == 'nightly'
53-
working-directory: ./examples/python
67+
python-version: ${{ matrix.python }}
68+
- name: Install dependencies nightly non-Windows
69+
if: matrix.release == 'nightly' && matrix.os != 'windows'
70+
run: |
71+
pip install -r ./scripts/requirements.txt
72+
latest_nightly_python=$(python ./scripts/latest-python-nightly-version.py)
73+
cd examples/python
74+
python -m pip install --upgrade pip
75+
pip install -r requirements.txt
76+
pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
77+
- name: Install dependencies nightly Windows
78+
if: matrix.release == 'nightly' && matrix.os == 'windows'
5479
run: |
80+
pip install -r ./scripts/requirements.txt
81+
$latest_nightly_python = python ./scripts/latest-python-nightly-version.py
82+
cd examples/python
5583
python -m pip install --upgrade pip
5684
pip install -r requirements.txt
57-
pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple --force-reinstall -v selenium
85+
pip install --index-url https://test.pypi.org/simple/ selenium==$latest_nightly_python --extra-index-url https://pypi.org/simple/ --upgrade --force-reinstall --break-system-packages
5886
- name: Install dependencies stable
5987
if: matrix.release == 'stable'
6088
working-directory: ./examples/python
@@ -69,8 +97,8 @@ jobs:
6997
- name: Run tests
7098
uses: nick-invision/[email protected]
7199
with:
72-
timeout_minutes: 20
100+
timeout_minutes: 60
73101
max_attempts: 3
74102
command: |
75103
cd examples/python
76-
pytest
104+
pytest --reruns 3

‎.github/workflows/ruby-examples.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
if: matrix.release == 'nightly' && matrix.os != 'windows'
5454
run:
5555
|
56-
latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
56+
pip install -r ./scripts/requirements.txt
57+
latest_nightly_webdriver=$(python ./scripts/latest-nightly-version.py rubygems selenium-webdriver)
58+
echo $latest_nightly_webdriver
5759
cd examples/ruby
5860
bundle install
5961
bundle remove selenium-webdriver
@@ -64,7 +66,8 @@ jobs:
6466
if: matrix.release == 'nightly' && matrix.os == 'windows'
6567
run:
6668
|
67-
$latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver
69+
pip install -r ./scripts/requirements.txt
70+
$latest_nightly_webdriver = python ./scripts/latest-nightly-version.py rubygems selenium-webdriver
6871
cd examples/ruby
6972
bundle install
7073
bundle remove selenium-webdriver

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
test_build:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Checkout repo
1616
uses: actions/checkout@v4

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ website_and_docs/resources
1111
.settings
1212
.gitignore
1313
.pydevproject
14+
**/*.iml
15+
**/.gradle

0 commit comments

Comments
 (0)