Skip to content

Commit 746f927

Browse files
cgoldbergcgoldberg
authored
Merge branch 'SeleniumHQ:trunk' into py-fix-test-args
2 parents 31b659c + e915b39 commit 746f927

Some content is hidden

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

67 files changed

+845
-424
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ body:
4949
id: selenium-version
5050
attributes:
5151
label: What version of Selenium are you currently using?
52-
description: Important! The latest released version of Selenium is 4.30 and we can't fix old versions.
52+
description: Important! The latest released version of Selenium is 4.31 and we can't fix old versions.
5353
placeholder: e.g., 4.17.0
5454
validations:
5555
required: true

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

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,7 @@ labels:
66
body: |
77
@{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
88
9-
---
10-
<details>
11-
<summary>Info for maintainers</summary>
12-
<div>
13-
<br>
14-
<p>
15-
Triage this issue by using labels.
16-
</p>
17-
<p>
18-
If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
19-
</p>
20-
<p>
21-
If the issue is a question, add the <code>I-question</code> label.
22-
</p>
23-
<p>
24-
If the issue is valid but there is no time to troubleshoot it, consider adding the <code>help wanted</code> label.
25-
</p>
26-
<p>
27-
If the issue requires changes or fixes from an external project (e.g., ChromeDriver, GeckoDriver, MSEdgeDriver, W3C),
28-
add the applicable <code>G-*</code> label, and it will provide the correct link and auto-close the
29-
issue.
30-
</p>
31-
<p>
32-
After troubleshooting the issue, please add the <code>R-awaiting answer</code> label.
33-
</p>
34-
<p>
35-
Thank you!
36-
</p>
37-
</div>
38-
</details>
9+
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
3910
- name: G-w3c
4011
labeled:
4112
issue:
@@ -122,14 +93,14 @@ labels:
12293
* 📮 [StackOverflow](https://stackoverflow.com/questions/tagged/selenium)
12394
* 🗣 Our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) where the community can help you as well
12495
action: close
125-
- name: help wanted
96+
- name: R-help wanted
12697
labeled:
12798
issue:
12899
body: |
129100
This issue is looking for contributors.
130101
131102
Please comment below or reach out to us through our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) if you are interested.
132-
- name: I-logging
103+
- name: J-logging
133104
labeled:
134105
issue:
135106
body: |

‎.github/workflows/issue-labeler.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,8 @@ jobs:
181181
with:
182182
github_token: ${{ secrets.GITHUB_TOKEN }}
183183
labels: J-awaiting answer
184+
- name: Remove label
185+
if: steps.version-check.outputs.is-outdated == 'true'
186+
uses: actions-ecosystem/action-remove-labels@v1
187+
with:
188+
labels: A-needs-triaging

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,5 @@ jobs:
2424
- name: Label Commenter
2525
uses: peaceiris/actions-label-commenter@v1
2626
with:
27-
# The individual PAT is needed so commenter can auto-executes on PRs from Forks
28-
# It expires 4/1/2026
29-
github_token: ${{ secrets.PR_LABELER_PAT }}
27+
github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
3028
config_file: .github/label-commenter-config.yml

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,5 @@ jobs:
2121
- name: Auto label Pull Requests
2222
uses: actions/labeler@v5
2323
with:
24-
# The individual PAT is needed so labeler auto-executes this workflow
25-
# It expires 4/1/2026
26-
repo-token: ${{ secrets.PR_LABELER_PAT }}
24+
repo-token: ${{ secrets.SELENIUM_CI_TOKEN }}
2725
configuration-path: .github/pr-labeler-config.yml

‎.github/workflows/pre-release.yml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,23 @@ jobs:
2525
with:
2626
persist-credentials: false
2727
fetch-depth: 0
28-
fetch-tags: true
2928
- name: "Prep git"
3029
run: |
3130
git config --local user.email "[email protected]"
3231
git config --local user.name "Selenium CI Bot"
33-
if git rev-parse --verify release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
34-
git branch -D release-${{ github.event.inputs.version }}
32+
if git rev-parse --verify rust-release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
33+
git branch -D rust-release-${{ github.event.inputs.version }}
3534
fi
36-
git checkout -b release-${{ github.event.inputs.version }}
35+
git checkout -b rust-release-${{ github.event.inputs.version }}
3736
- name: Update Rust Version
38-
run: |
39-
./go rust:version[${{ github.event.inputs.version }}]
40-
./go rust:version:commit
37+
run: ./go rust:version ${{ github.event.inputs.version }}
38+
- name: Commit Rust updates
39+
run: git commit -m "update selenium manager version and rust changelog"
4140
- name: Push changes
4241
uses: ad-m/github-push-action@master
4342
with:
4443
github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
45-
branch: release-${{ github.event.inputs.version }}
44+
branch: rust-release-${{ github.event.inputs.version }}
4645
force: true
4746

4847
selenium-manager:
@@ -51,10 +50,23 @@ jobs:
5150
uses: ./.github/workflows/ci-rust.yml
5251
with:
5352
release: true
54-
branch: release-${{ github.event.inputs.version }}
53+
branch: rust-release-${{ github.event.inputs.version }}
5554
secrets:
5655
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
5756

57+
cleanup-rust-branch:
58+
name: Cleanup Rust Branch
59+
needs: selenium-manager
60+
runs-on: ubuntu-latest
61+
steps:
62+
- name: "Checkout repo"
63+
uses: actions/checkout@v4
64+
with:
65+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
66+
- name: "Delete rust release branch"
67+
run: |
68+
git push origin --delete rust-release-${{ github.event.inputs.version }}
69+
5870
update-files:
5971
name: Update Files
6072
runs-on: ubuntu-latest
@@ -79,11 +91,11 @@ jobs:
7991
git config --local user.email "[email protected]"
8092
git config --local user.name "Selenium CI Bot"
8193
- name: Update browser versions
82-
run: ./go update_browsers[${{ github.event.inputs.chrome_channel }}]
94+
run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
8395
- name: Commit browser updates
8496
run: git commit -m "update pinned browser versions"
8597
- name: Update devtools versions
86-
run: ./go all:update_cdp[${{ github.event.inputs.chrome_channel }}]
98+
run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
8799
- name: Commit DevTools updates
88100
run: git commit -m "update devtools versions"
89101
- name: Update Selenium Manager versions
@@ -99,7 +111,7 @@ jobs:
99111
- name: Commit Authors updates
100112
run: git commit -m "update authors file"
101113
- name: Bump minor version
102-
run: ./go all:version
114+
run: ./go all:version ${{ github.event.inputs.version }}
103115
- name: Commit version updates
104116
run: git commit -m "bump versions in preparation for release"
105117
- name: Update changelog

‎.github/workflows/stage-release.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111

1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14-
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
1514

1615
jobs:
1716
github-release:
@@ -32,7 +31,8 @@ jobs:
3231
- name: Extract version from branch name
3332
if: github.event.pull_request.merged == true
3433
run: |
35-
VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
34+
TEMP_BRANCH_NAME=${{ github.event.pull_request.head.ref }}
35+
VERSION=$(echo $TEMP_BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
3636
echo "VERSION=$VERSION" >> $GITHUB_ENV
3737
- name: Extract version from workflow input
3838
if: github.event_name == 'workflow_dispatch'
@@ -50,6 +50,14 @@ jobs:
5050
distribution: 'temurin'
5151
- name: Setup curl for Ubuntu
5252
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
53+
- name: Delete nightly tag
54+
run: |
55+
if git rev-parse --verify refs/tags/nightly >/dev/null 2>&1; then
56+
echo "Deleting nightly tag"
57+
git push origin --delete refs/tags/nightly
58+
else
59+
echo "No nightly tag found - nothing to delete"
60+
fi
5361
- name: Build and Stage Packages
5462
run: ./go all:package[--config=release]
5563
- name: Generate Draft Release

‎.github/workflows/update-docs-after-action.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Update Version After Docs Merge
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches:
7+
- gh-pages
8+
paths:
9+
- 'docs/api/**'
10+
11+
jobs:
12+
update-version:
13+
if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'Update documentation for Selenium')
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout trunk branch
17+
uses: actions/checkout@v4
18+
with:
19+
ref: trunk
20+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
21+
22+
- name: Setup git
23+
run: |
24+
git config --local user.email "[email protected]"
25+
git config --local user.name "Selenium CI Bot"
26+
27+
- name: Update versions to nightly
28+
run: ./go all:version nightly
29+
30+
- name: Bump Nightly Versions Pull Request
31+
id: cpr
32+
uses: peter-evans/create-pull-request@v6
33+
with:
34+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
35+
author: Selenium CI Bot <[email protected]>
36+
delete-branch: true
37+
branch: bump-nightly-version
38+
title: Update to nightly versions
39+
body: |
40+
This PR bumps the bindings to nightly versions after merging
41+
the PR updating the API documentation.
42+
43+
- Auto-generated by [workflow run #${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
44+
labels: B-docs
45+
draft: false
46+
- name: Enable Pull Request Auto-merge
47+
if: steps.cpr.outputs.pull-request-operation == 'created'
48+
uses: peter-evans/enable-pull-request-automerge@v3
49+
with:
50+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
51+
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
52+
merge-method: squash

‎.github/workflows/update-documentation.yml‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,8 @@ env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838

3939
jobs:
40-
determine-languages:
41-
runs-on: ubuntu-latest
42-
outputs:
43-
matrix: ${{ steps.set-matrix.outputs.matrix }}
44-
steps:
45-
- id: set-matrix
46-
run: |
47-
if [ "${{ inputs.language }}" == "all" ]; then
48-
echo 'matrix={"language":["java","rb","py","dotnet","node"]}' >> $GITHUB_OUTPUT
49-
else
50-
echo 'matrix={"language":["${{ inputs.language }}"]}' >> $GITHUB_OUTPUT
51-
fi
5240
build-docs:
53-
needs: determine-languages
5441
runs-on: ubuntu-latest
55-
strategy:
56-
matrix: ${{ fromJson(needs.determine-languages.outputs.matrix) }}
57-
fail-fast: false
5842
steps:
5943
- name: Checkout repository
6044
uses: actions/checkout@v4
@@ -69,43 +53,49 @@ jobs:
6953
- name: Setup curl for Ubuntu
7054
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
7155
- name: Setup Java
56+
if: ${{ inputs.language == 'java' || inputs.language == 'all' }}
7257
uses: actions/setup-java@v4
7358
with:
7459
java-version: 17
7560
distribution: 'temurin'
7661
- name: Set up Python 3.9
77-
if: ${{ matrix.language == 'py' }}
62+
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
7863
uses: actions/setup-python@v5
7964
with:
8065
python-version: 3.9
8166
- name: Install dependencies
82-
if: ${{ matrix.language == 'py' }}
67+
if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
8368
run: |
8469
python -m pip install --upgrade pip
8570
pip install tox
8671
- name: Install npm dependencies
87-
if: ${{ matrix.language == 'node' }}
72+
if: ${{ inputs.language == 'node' || inputs.language == 'all' }}
8873
run: |
8974
npm install
9075
npm install --prefix javascript/selenium-webdriver
91-
- name: Update Documentation
92-
run: ./go ${{ matrix.language }}:docs
76+
- name: Generate Documentation for selected langauges
77+
run: ./go ${{ inputs.language }}:docs
9378
- name: Documentation Pull Request
79+
id: cpr
9480
uses: peter-evans/create-pull-request@v6
9581
with:
9682
token: ${{ secrets.SELENIUM_CI_TOKEN }}
9783
author: Selenium CI Bot <[email protected]>
9884
delete-branch: true
99-
branch: api-docs-${{ inputs.version }}-${{ matrix.language }}
85+
branch: api-docs-${{ inputs.version }}
10086
base: gh-pages
101-
add-paths: |
102-
${{ matrix.language == 'node' && 'docs/api/javascript/**' || format('docs/api/{0}/**', matrix.language) }}
103-
title: Update documentation for Selenium ${{ inputs.version }} (${{ matrix.language }})
87+
add-paths: docs/api/**
88+
title: Update documentation for Selenium ${{ inputs.version }}
10489
body: |
105-
This PR updates the API documentation for **${{ matrix.language }}** language bindings to version **${{ inputs.version }}**.
90+
This PR updates the API documentation for version **${{ inputs.version }}-${{ inputs.language }}**.
10691
107-
- Auto-generated by [create-pull-request][1]
108-
109-
[1]: https://github.com/peter-evans/create-pull-request
92+
- Auto-generated by [workflow run #${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
11093
labels: B-docs
11194
draft: false
95+
- name: Enable Pull Request Auto-merge
96+
if: steps.cpr.outputs.pull-request-operation == 'created'
97+
uses: peter-evans/enable-pull-request-automerge@v3
98+
with:
99+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
100+
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
101+
merge-method: squash

‎AUTHORS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,7 @@ Rob Wu <[email protected]>
746746
Robert Elliot <[email protected]>
747747
Robert Fletcher <[email protected]>
748748
Roberto Rivera <[email protected]>
749+
Robin <[email protected]>
749750
Robin Stocker <[email protected]>
750751
Rod McNew <[email protected]>
751752
Romain Tartière <[email protected]>
@@ -772,6 +773,7 @@ Sam Uong <[email protected]>
772773
Samit Badle <[email protected]>
773774
Samuel Bétrisey <[email protected]>
774775
Sandeep Suryaprasad <[email protected]>
776+
Sandro <[email protected]>
775777
Sankha Narayan Guria <[email protected]>
776778
Santiago Suarez Ordoñez <[email protected]>
777779
Sarah Bird <[email protected]>

0 commit comments

Comments
 (0)