Skip to content

Commit fc3f165

Browse files
Merge branch 'trunk' into fix-typing-in-remote-webdriver
2 parents c28f4a6 + 1b64798 commit fc3f165

File tree

761 files changed

+21451
-19368
lines changed

Some content is hidden

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

761 files changed

+21451
-19368
lines changed

.bazelrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ build --nobuild_runfile_links
3939

4040
# More JS magic
4141
build --experimental_allow_unresolved_symlinks
42+
# Avoid a warning about directory tracking being unsound
43+
startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
4244

4345
# Required for faster TS builds
4446
build --@aspect_rules_ts//ts:skipLibCheck=always
@@ -100,8 +102,14 @@ test --test_timeout=1800
100102
test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
101103
test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//bin:rdbg --nonstop --open --command"
102104

103-
build:release --config=remote
105+
104106
build:release --stamp
107+
build:release --compilation_mode=opt
108+
109+
# As regular `release` but all the build work happens on the RBE
110+
build:remote_release --config=release
111+
build:remote_release --config=remote
112+
build:remote_release --remote_download_toplevel
105113

106114
# RBE
107115
import %workspace%/.bazelrc.remote

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
7.3.1

.github/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
-dependencies
5+
authors:
6+
- selenium-ci

.github/workflows/bazel.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ jobs:
146146
- name: Setup Safari
147147
if: inputs.browser == 'safari'
148148
run: sudo safaridriver --enable
149+
- name: Setup curl for Ubuntu
150+
if: inputs.os == 'ubuntu'
151+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
149152
- name: Run Bazel
150153
run: ${{ inputs.run }}
151154
- name: Start SSH session

.github/workflows/ci-javascript.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/ci-ruby.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,9 @@ jobs:
7474
- edge
7575
- firefox
7676
os:
77-
- ubuntu
7877
- windows
7978
- macos
8079
exclude:
81-
- browser: edge
82-
os: ubuntu
8380
- browser: edge
8481
os: macos
8582
with:
@@ -94,7 +91,7 @@ jobs:
9491
--local_test_jobs 1
9592
--test_size_filters large
9693
--test_tag_filters ${{ matrix.browser }}
97-
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
94+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
9895
//rb/spec/...
9996
10097
integration-tests-remote:
@@ -107,10 +104,6 @@ jobs:
107104
include:
108105
- browser: edge
109106
os: windows
110-
- browser: chrome
111-
os: ubuntu
112-
- browser: firefox
113-
os: ubuntu
114107
with:
115108
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
116109
browser: ${{ matrix.browser }}
@@ -124,5 +117,5 @@ jobs:
124117
--local_test_jobs 1
125118
--test_size_filters large
126119
--test_tag_filters ${{ matrix.browser }}-remote
127-
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
120+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
128121
//rb/spec/...

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ jobs:
5959
contains(join(github.event.commits.*.message), '[java]') ||
6060
contains(github.event.pull_request.title, '[java]')
6161
62-
javascript:
63-
name: JavaScript
64-
needs: check
65-
uses: ./.github/workflows/ci-javascript.yml
66-
if: >
67-
github.event_name == 'schedule' ||
68-
github.event_name == 'workflow_dispatch' ||
69-
contains(needs.check.outputs.targets, '//javascript') ||
70-
contains(join(github.event.commits.*.message), '[js]') ||
71-
contains(github.event.pull_request.title, '[js]')
72-
7362
python:
7463
name: Python
7564
needs: check
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Delete Comments
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
delete_comment:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check for specific strings in comment
15+
id: check_comment
16+
uses: actions/github-script@v7
17+
with:
18+
script: |
19+
const comment = context.payload.comment.body;
20+
const triggerStrings = ['www.mediafire.com'];
21+
return triggerStrings.some(triggerString => comment.includes(triggerString));
22+
23+
- name: Delete comment if it contains any of the specific strings
24+
if: steps.check_comment.outputs.result == 'true'
25+
uses: actions/github-script@v7
26+
with:
27+
script: |
28+
const commentId = context.payload.comment.id;
29+
await github.rest.issues.deleteComment({
30+
owner: context.repo.owner,
31+
repo: context.repo.repo,
32+
comment_id: commentId
33+
});
34+
35+
- name: Block user from the org if their comment contained any of the banned strings
36+
if: steps.check_comment.outputs.result == 'true'
37+
uses: actions/github-script@v7
38+
with:
39+
script: |
40+
const username = context.payload.comment.user.login
41+
await github.rest.orgs.blockUser({
42+
org: context.repo.owner,
43+
username: username
44+
});

.github/workflows/pre-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
git checkout -b release-${{ github.event.inputs.version }}
3737
- name: Update Rust Version
3838
run: |
39-
./go rust:version
39+
./go rust:version[${{ github.event.inputs.version }}]
4040
./go rust:version:commit
4141
- name: Push changes
4242
uses: ad-m/github-push-action@master
@@ -72,6 +72,8 @@ jobs:
7272
with:
7373
ruby-version: '3.1'
7474
working-directory: 'rb'
75+
- name: Setup curl for Ubuntu
76+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
7577
- name: "Prep git"
7678
run: |
7779
git config --local user.email "[email protected]"

.github/workflows/stage-release.yml

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,73 @@ name: Release Staging
22

33
on:
44
pull_request:
5-
types: [closed]
5+
types: [ closed ]
6+
workflow_dispatch:
7+
inputs:
8+
version:
9+
description: 'Selenium version to release'
10+
required: true
611

712
env:
813
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
915

1016
jobs:
1117
github-release:
1218
if: >
13-
github.event.pull_request.merged == true &&
19+
(github.event.pull_request.merged == true &&
1420
github.repository_owner == 'seleniumhq' &&
15-
startsWith(github.event.pull_request.head.ref, 'release-preparation-')
21+
startsWith(github.event.pull_request.head.ref, 'release-preparation-')) ||
22+
(github.event_name == 'workflow_dispatch' &&
23+
github.event.inputs.version != '' &&
24+
github.repository_owner == 'seleniumhq')
1625
runs-on: ubuntu-latest
26+
permissions: write-all
1727
steps:
1828
- name: Checkout repo
1929
uses: actions/checkout@v4
2030
- name: Extract version from branch name
21-
id: extract_version
31+
if: github.event.pull_request.merged == true
2232
run: |
23-
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
2433
VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
2534
echo "VERSION=$VERSION" >> $GITHUB_ENV
35+
- name: Extract version from workflow input
36+
if: github.event_name == 'workflow_dispatch'
37+
run: |
38+
VERSION=${{ inputs.version }}
39+
echo "VERSION=$VERSION" >> $GITHUB_ENV
2640
- name: Prep git
2741
run: |
2842
git config --local user.email "[email protected]"
2943
git config --local user.name "Selenium CI Bot"
30-
- name: Tag Release
31-
run: |
32-
git tag selenium-${{ env.VERSION }}
33-
git push origin selenium-${{ env.VERSION }}
34-
- name: Update Nightly Tag to Remove pre-release
35-
run: |
36-
git fetch --tags
37-
git tag -d nightly || echo "Nightly tag not found"
38-
git tag nightly
39-
git push origin refs/tags/nightly --force
44+
# - name: Tag Release
45+
# run: |
46+
# git tag selenium-${{ env.VERSION }} || echo "Tag already exists"
47+
# git push origin selenium-${{ env.VERSION }} || echo "Tag already exists remotely"
4048
- name: Setup Java
4149
uses: actions/setup-java@v3
4250
with:
4351
java-version: 17
4452
distribution: 'temurin'
53+
- name: Setup curl for Ubuntu
54+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
4555
- name: Build and Stage Packages
4656
run: ./go all:package[--config=release]
4757
- name: Generate Draft Release
48-
uses: softprops/action-gh-release@v2
58+
uses: ncipollo/release-action@v1
4959
with:
50-
name: Selenium ${{ env.VERSION }}
51-
body: |
52-
## Detailed Changelogs by Component
53-
<img src="https://www.selenium.dev/images/programming/java.svg" width="20" height="20"> **[Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/python.svg" width="20" height="20"> **[Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/csharp.svg" width="20" height="20"> **[DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/ruby.svg" width="20" height="20"> **[Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/javascript.svg" width="20" height="20"> **[JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/browsers/internet-explorer.svg" width="20" height="20"> **[IEDriver](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)**
54-
<br>
55-
tag_name: selenium-${{ env.VERSION }}
60+
artifacts: "build/dist/*.*"
61+
bodyFile: "scripts/github-actions/release_header.md"
5662
draft: true
57-
generate_release_notes: true
63+
generateReleaseNotes: true
64+
name: "Selenium ${{ env.VERSION }}"
5865
prerelease: false
59-
files: build/dist/*.*
66+
skipIfReleaseExists: true
67+
tag: "selenium-${{ env.VERSION }}"
68+
commit: "${{ github.sha }}"
69+
70+
update-documentation:
71+
needs: github-release
72+
uses: ./.github/workflows/update-documentation.yml
73+
with:
74+
tag: selenium-${{ needs.github-release.outputs.version }}

0 commit comments

Comments
 (0)