Skip to content

Commit 02efbf6

Browse files
diemoldiemol
authored
Merge branch 'trunk' into Fixed_small_typos
2 parents 85cdbf6 + d82c9e8 commit 02efbf6

File tree

509 files changed

+16680
-9376
lines changed

Some content is hidden

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

509 files changed

+16680
-9376
lines changed

‎.github/workflows/calibreapp-image-actions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
github.event.pull_request.head.repo.full_name == github.repository)
3737
steps:
3838
- name: Checkout Branch
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
- name: Compress Images
4141
id: calibre
4242
uses: calibreapp/image-actions@main
@@ -49,7 +49,7 @@ jobs:
4949
if: |
5050
github.event_name != 'pull_request' &&
5151
steps.calibre.outputs.markdown != ''
52-
uses: peter-evans/create-pull-request@v6
52+
uses: peter-evans/create-pull-request@v7
5353
with:
5454
title: Auto Compress Images
5555
branch-suffix: timestamp

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ on:
44
push:
55
branches:
66
- trunk
7+
workflow_dispatch:
78

89
jobs:
910
deploy:
10-
if: contains(toJson(github.event.commits), '[deploy site]') == true
11-
runs-on: ubuntu-22.04
11+
if: contains(toJson(github.event.commits), '[deploy site]') == true || github.event_name == 'workflow_dispatch'
12+
runs-on: ubuntu-24.04
1213
steps:
1314
- name: Checkout repo
14-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1516
with:
1617
fetch-depth: 0
1718
- name: Setup Hugo

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
- name: Remove driver directories Windows
3535
if: matrix.os == 'windows'
3636
run: |
@@ -48,20 +48,22 @@ jobs:
4848
if: matrix.release == 'stable'
4949
uses: actions/setup-dotnet@v4
5050
with:
51-
dotnet-version: 6.x
51+
dotnet-version: 8.x
5252
- name: Set up .Net Nightly
5353
if: matrix.release == 'nightly'
5454
uses: actions/setup-dotnet@v4
5555
with:
56-
dotnet-version: 6.x
56+
dotnet-version: 8.x
5757
source-url: https://nuget.pkg.github.com/seleniumhq/index.json
5858
env:
5959
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
6060
- name: Update Nightly version non-Windows
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:
@@ -82,10 +85,10 @@ jobs:
8285
distribution: 'temurin'
8386
java-version: 11
8487
- name: Run tests
85-
uses: nick-fields/[email protected].0
88+
uses: nick-fields/[email protected].2
8689
with:
87-
timeout_minutes: 20
88-
max_attempts: 3
90+
timeout_minutes: 40
91+
max_attempts: 2
8992
command: |
9093
cd examples/dotnet/SeleniumDocs
9194
dotnet test

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

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434
- name: Remove driver directories Windows
3535
if: matrix.os == 'windows'
3636
run: |
@@ -45,43 +45,63 @@ 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'
54-
uses: nick-invision/[email protected].0
61+
uses: nick-invision/[email protected].2
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'
63-
uses: nick-invision/[email protected].0
70+
uses: nick-invision/[email protected].2
6471
with:
65-
timeout_minutes: 20
72+
timeout_minutes: 40
6673
max_attempts: 3
6774
command: |
68-
pip install yq
69-
xml_content=$(curl -sf https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/)
70-
latest_snapshot=$(echo $xml_content | xq '.content.data."content-item"' | jq -r .text)
71-
echo $latest_snapshot
72-
cd examples/java
73-
mvn -B -U test -Dselenium.version="$latest_snapshot"
74-
75+
# Get current selenium.version from Maven
76+
current_version=$(mvn -f examples/java/pom.xml help:evaluate -Dexpression=selenium.version -q -DforceStdout)
77+
echo "Current selenium.version: $current_version"
78+
# If version is in the form X.Y.Z, bump minor and set to SNAPSHOT
79+
if [[ $current_version =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
80+
major="${BASH_REMATCH[1]}"
81+
minor="${BASH_REMATCH[2]}"
82+
next_minor=$((minor + 1))
83+
new_version="$major.$next_minor.0-SNAPSHOT"
84+
echo "Using selenium.version $new_version for tests"
85+
cd examples/java
86+
mvn -B -U test -D"jdk.internal.httpclient.disableHostnameVerification=true" -Dselenium.version=$new_version
87+
fi
7588
- name: Run Tests Nightly Windows
7689
if: matrix.release == 'nightly' && matrix.os == 'windows'
77-
uses: nick-invision/[email protected].0
90+
uses: nick-invision/[email protected].2
7891
with:
79-
timeout_minutes: 20
92+
timeout_minutes: 40
8093
max_attempts: 3
8194
command: |
82-
pip install yq
83-
$xml_content = Invoke-WebRequest -Uri "https://oss.sonatype.org/service/local/repositories/snapshots/content/org/seleniumhq/selenium/selenium-java/"
84-
$latest_snapshot = $xml_content.Content | xq '.content.data.\"content-item\"' | jq -r .text
85-
Write-Output $latest_snapshot
86-
cd examples/java
87-
mvn -B -U test "-Dselenium.version=$latest_snapshot"
95+
# Get current selenium.version from Maven
96+
$current_version = & mvn -f examples/java/pom.xml help:evaluate -Dexpression=selenium.version -q -DforceStdout
97+
Write-Output "Current selenium.version: $current_version"
98+
# If version is in the form X.Y.Z, bump minor and set to SNAPSHOT
99+
if ($current_version -match '^([0-9]+)\.([0-9]+)\.([0-9]+)$') {
100+
$major = $matches[1]
101+
$minor = $matches[2]
102+
$next_minor = [int]$minor + 1
103+
$new_version = "$major.$next_minor.0-SNAPSHOT"
104+
Write-Output "Using selenium.version $new_version for tests"
105+
cd examples/java
106+
mvn -B -U test "-Djdk.internal.httpclient.disableHostnameVerification=true" "-Dselenium.version=$new_version"
107+
}

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

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,7 @@ jobs:
3030
runs-on: ${{ format('{0}-latest', matrix.os) }}
3131
steps:
3232
- name: Checkout GitHub repo
33-
uses: actions/checkout@v4
34-
- name: Install Chrome for set binary test
35-
uses: browser-actions/setup-chrome@v1
36-
with:
37-
chrome-version: stable
38-
id: setup-chrome
39-
- name: Install Edge for set binary test
40-
uses: browser-actions/setup-edge@v1
41-
with:
42-
edge-version: stable
43-
id: setup-edge
44-
- name: Install Firefox for set binary test
45-
if: matrix.os != 'windows'
46-
uses: browser-actions/setup-firefox@v1
47-
with:
48-
firefox-version: latest
49-
id: setup-firefox
50-
- name: Set ENV Windows
51-
if: matrix.os == 'windows'
52-
run: |
53-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
54-
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
55-
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
56-
- name: Set ENV Mac
57-
if: matrix.os == 'macos'
58-
run: |
59-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
60-
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
61-
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
62-
- name: Set ENV Linux
63-
if: matrix.os == 'ubuntu'
64-
run: |
65-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
66-
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
67-
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
33+
uses: actions/checkout@v5
6834
- name: Remove driver directories Windows
6935
if: matrix.os == 'windows'
7036
run: |
@@ -82,18 +48,20 @@ jobs:
8248
if: matrix.release == 'stable'
8349
uses: actions/setup-node@v4
8450
with:
85-
node-version: '18.x'
51+
node-version: '22.x'
8652
- name: Setup Node Nightly
8753
if: matrix.release == 'nightly'
8854
uses: actions/setup-node@v4
8955
with:
90-
node-version: '18.x'
56+
node-version: '22.x'
9157
registry-url: 'https://npm.pkg.github.com'
9258
- name: Use Nightly package.json in Ubuntu/macOS
9359
if: matrix.release == 'nightly' && matrix.os != 'windows'
9460
run:
9561
|
96-
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
62+
pip install -r ./scripts/requirements.txt
63+
latest_nightly=$(python ./scripts/latest-nightly-version.py npm selenium-webdriver)
64+
echo $latest_nightly
9765
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
9866
env:
9967
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -102,7 +70,8 @@ jobs:
10270
if: matrix.release == 'nightly' && matrix.os == 'windows'
10371
run:
10472
|
105-
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
73+
pip install -r ./scripts/requirements.txt
74+
$latest_nightly = python ./scripts/latest-nightly-version.py npm selenium-webdriver
10675
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
10776
env:
10877
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,10 +82,10 @@ jobs:
11382
env:
11483
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11584
- name: Run tests
116-
uses: nick-invision/[email protected].0
85+
uses: nick-invision/[email protected].2
11786
with:
118-
timeout_minutes: 20
119-
max_attempts: 3
87+
timeout_minutes: 40
88+
max_attempts: 2
12089
command: |
12190
cd examples/javascript
12291
npm test

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

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,41 +29,7 @@ jobs:
2929
runs-on: ${{ format('{0}-latest', matrix.os) }}
3030
steps:
3131
- name: Checkout GitHub repo
32-
uses: actions/checkout@v4
33-
- name: Install Chrome for set binary test
34-
uses: browser-actions/setup-chrome@v1
35-
with:
36-
chrome-version: stable
37-
id: setup-chrome
38-
- name: Install Edge for set binary test
39-
uses: browser-actions/setup-edge@v1
40-
with:
41-
edge-version: stable
42-
id: setup-edge
43-
- name: Install Firefox for set binary test
44-
if: matrix.os != 'windows'
45-
uses: browser-actions/setup-firefox@v1
46-
with:
47-
firefox-version: latest
48-
id: setup-firefox
49-
- name: Set ENV Windows
50-
if: matrix.os == 'windows'
51-
run: |
52-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> $env:GITHUB_ENV
53-
echo "EDGE_BIN=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe" >> $env:GITHUB_ENV
54-
echo "FF_BIN=C:\Program Files (x86)\Mozilla Firefox\firefox-browser.exe" >> $env:GITHUB_ENV
55-
- name: Set ENV Mac
56-
if: matrix.os == 'macos'
57-
run: |
58-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
59-
echo "EDGE_BIN=/Users/runner/hostedtoolcache/msedge/stable/x64/Contents/MacOS/Microsoft Edge" >> "$GITHUB_ENV"
60-
echo "FF_BIN=/Users/runner/hostedtoolcache/firefox/latest/x64/Contents/MacOS/firefox" >> "$GITHUB_ENV"
61-
- name: Set ENV Linux
62-
if: matrix.os == 'ubuntu'
63-
run: |
64-
echo "CHROME_BIN=${{ steps.setup-chrome.outputs.chrome-path }}" >> "$GITHUB_ENV"
65-
echo "EDGE_BIN=/opt/hostedtoolcache/msedge/stable/x64/msedge" >> "$GITHUB_ENV"
66-
echo "FF_BIN=/opt/hostedtoolcache/firefox/latest/x64/firefox" >> "$GITHUB_ENV"
32+
uses: actions/checkout@v5
6733
- name: Remove driver directories Windows
6834
if: matrix.os == 'windows'
6935
run: |
@@ -83,10 +49,10 @@ jobs:
8349
distribution: 'temurin'
8450
java-version: 11
8551
- name: Run tests
86-
uses: nick-invision/[email protected].0
52+
uses: nick-invision/[email protected].2
8753
with:
88-
timeout_minutes: 20
89-
max_attempts: 3
54+
timeout_minutes: 40
55+
max_attempts: 2
9056
command: |
9157
cd examples/kotlin
9258
mvn -B test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ permissions:
1111

1212
jobs:
1313
comment:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
- name: Label Commenter
1818
uses: peaceiris/actions-label-commenter@v1

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ on:
77
push:
88
branches:
99
- trunk
10+
paths:
11+
- 'website_and_docs/**'
1012
pull_request:
13+
paths:
14+
- 'website_and_docs/**'
1115

1216
jobs:
1317
htmltest:
@@ -16,7 +20,7 @@ jobs:
1620
group: ${{ github.workflow }}-${{ github.ref }}
1721
steps:
1822
- name: Check out repository
19-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2024

2125
- name: Set up Hugo
2226
uses: peaceiris/actions-hugo@v3
@@ -27,7 +31,7 @@ jobs:
2731
- name: Setup Node
2832
uses: actions/setup-node@v4
2933
with:
30-
node-version: '18.14.2'
34+
node-version: '22.18.0'
3135
cache: 'npm'
3236
# The action defaults to search for the dependency file (package-lock.json,
3337
# npm-shrinkwrap.json or yarn.lock) in the repository root, and uses its
@@ -42,7 +46,7 @@ jobs:
4246

4347
- name: Link check
4448
continue-on-error: true # <- If set to false, run fails with broken links
45-
uses: untitaker/[email protected].32
49+
uses: untitaker/[email protected].44
4650
with:
4751
args: website_and_docs/public/ --check-anchors
4852

0 commit comments

Comments
 (0)