Skip to content

Commit db8f912

Browse files
Delta456Delta456
authored
Merge branch 'trunk' into sm_check_browser_version
2 parents e725eeb + aabdb7f commit db8f912

Some content is hidden

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

63 files changed

+815
-400
lines changed

‎.github/workflows/pre-release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -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

+50-23
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ 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 }}
@@ -11,52 +16,74 @@ env:
1116
jobs:
1217
github-release:
1318
if: >
14-
github.event.pull_request.merged == true &&
19+
(github.event.pull_request.merged == true &&
1520
github.repository_owner == 'seleniumhq' &&
16-
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')
1725
runs-on: ubuntu-latest
1826
steps:
1927
- name: Checkout repo
2028
uses: actions/checkout@v4
2129
- name: Extract version from branch name
22-
id: extract_version
30+
if: github.event.pull_request.merged == true
2331
run: |
2432
VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
2533
echo "VERSION=$VERSION" >> $GITHUB_ENV
34+
- name: Extract version from workflow input
35+
if: github.event_name == 'workflow_dispatch'
36+
run: |
37+
VERSION=${{ inputs.version }}
38+
echo "VERSION=$VERSION" >> $GITHUB_ENV
2639
- name: Prep git
2740
run: |
2841
git config --local user.email "[email protected]"
2942
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
43+
# - name: Tag Release
44+
# run: |
45+
# git tag selenium-${{ env.VERSION }} || echo "Tag already exists"
46+
# git push origin selenium-${{ env.VERSION }} || echo "Tag already exists remotely"
4047
- name: Setup Java
4148
uses: actions/setup-java@v3
4249
with:
4350
java-version: 17
4451
distribution: 'temurin'
52+
- name: Setup curl for Ubuntu
53+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
4554
- name: Build and Stage Packages
4655
run: ./go all:package[--config=release]
56+
# - name: Update Nightly Tag to Remove pre-release
57+
# run: |
58+
# git fetch --tags
59+
# git tag -d nightly || echo "Nightly tag not found"
60+
# git tag nightly
61+
# git push origin refs/tags/nightly --force
4762
- name: Generate Draft Release
48-
uses: softprops/action-gh-release@v2
63+
uses: ncipollo/release-action@v1
4964
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 }}
65+
artifacts: "build/dist/*.*"
66+
bodyFile: "scripts/github-actions/release_header.md"
5667
draft: true
57-
generate_release_notes: true
68+
generateReleaseNotes: true
69+
name: Selenium ${{ env.VERSION }}
5870
prerelease: false
59-
files: build/dist/*.*
71+
skipIfReleaseExists: true
72+
tag: selenium-${{ env.VERSION }}
73+
commit: trunk
74+
# - name: Generate Draft Release
75+
# uses: softprops/action-gh-release@v2
76+
# with:
77+
# name: Selenium ${{ env.VERSION }}
78+
# body: |
79+
# ## Detailed Changelogs by Component
80+
# <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)**
81+
# <br>
82+
# tag_name: selenium-${{ env.VERSION }}
83+
# draft: true
84+
# generate_release_notes: true
85+
# prerelease: false
86+
# files: build/dist/*.*
6087

6188
update-documentation:
6289
needs: github-release

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ py/docs/source/**/*
7878
py/build/
7979
py/LICENSE
8080
py/pytestdebug.log
81+
py/python.iml
8182
selenium.egg-info/
8283
third_party/java/jetty/jetty-repacked.jar
8384
*.user

‎AUTHORS

+11-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ Ahmed Ashour <[email protected]>
2323
AJ <[email protected]>
2424
Ajay Kemparaj <[email protected]>
2525
Akhil Lb <[email protected]>
26-
Ákos Lukács <[email protected]>
2726
Akuli <[email protected]>
2827
Al Sutton <[email protected]>
2928
Alan Baird <[email protected]>
@@ -137,7 +136,6 @@ Carlos Ortega <[email protected]>
137136
Carlos Villela
138137
Carson McDonald <[email protected]>
139138
ce86f3bb9faf71e <[email protected]>
140-
Cédric Boutillier <[email protected]>
141139
Cervac Petru <[email protected]>
142140
cezarelnazli <[email protected]>
143141
ch-saeki <[email protected]>
@@ -174,6 +172,7 @@ Coty Rosenblath <[email protected]>
174172
Craig Nishina <[email protected]>
175173
CsolG <[email protected]>
176174
customcommander <[email protected]>
175+
Cédric Boutillier <[email protected]>
177176
Dakkaron <[email protected]>
178177
Damien Allison <[email protected]>
179178
Damir <[email protected]>
@@ -232,6 +231,7 @@ Dmitry Tokarev <[email protected]>
232231
Dmytro Shpakovskyi <[email protected]>
233232
dnknitro <[email protected]>
234233
doctor-house <[email protected]>
234+
Dominic Evans <[email protected]>
235235
Dominik Dary <[email protected]>
236236
Dominik Rauch <[email protected]>
237237
Dominik Stadler <[email protected]>
@@ -267,7 +267,6 @@ Eric Plaster <[email protected]>
267267
Erik Beans <[email protected]>
268268
Erik E. Beerepoot <[email protected]>
269269
Erik Kuefler <[email protected]>
270-
Étienne Barrié <[email protected]>
271270
Evan Sangaline <[email protected]>
272271
Evgeniy Roldukhin <[email protected]>
273272
EwaMarek <[email protected]>
@@ -279,10 +278,10 @@ Florian LOPES <[email protected]>
279278
Florian Mutter <[email protected]>
280279
Florian Zipperle <[email protected]>
281280
Francis Bergin <[email protected]>
281+
Franz Liedke <[email protected]>
282282
François Freitag <[email protected]>
283283
François JACQUES <[email protected]>
284284
François Reynaud <[email protected]>
285-
Franz Liedke <[email protected]>
286285
Frederik Carlier <[email protected]>
287286
Fredrik Wollsén <[email protected]>
288287
freynaud <[email protected]>
@@ -425,7 +424,6 @@ Jim van Musscher <[email protected]>
425424
jkbzh <[email protected]>
426425
jkohls <[email protected]>
427426
jmuramatsu <[email protected]>
428-
João Luca Ripardo <[email protected]>
429427
Joaquín Romero <[email protected]>
430428
jochenberger <[email protected]>
431429
Joe Bandenburg <[email protected]>
@@ -457,12 +455,12 @@ Jonathan Lipps <[email protected]>
457455
Jonathon Kereliuk <[email protected]>
458456
Jongkuen Hong <[email protected]>
459457
Jordan Mace <[email protected]>
460-
Jörg Sautter <[email protected]>
461458
josephg <[email protected]>
462459
Josh Goldberg <[email protected]>
463460
Joshua Bruning <[email protected]>
464461
Joshua Fehler <[email protected]>
465462
Joshua Grant <[email protected]>
463+
João Luca Ripardo <[email protected]>
466464
JT Archie <[email protected]>
467465
jugglinmike <[email protected]>
468466
Julian Didier <[email protected]>
@@ -477,6 +475,7 @@ Justin Tulloss <[email protected]>
477475
Justine Tunney <[email protected]>
478476
[email protected] <[email protected]>
479477
jwoolley <[email protected]>
478+
Jörg Sautter <[email protected]>
480479
Kamen Litchev <[email protected]>
481480
Karl Kuehn <[email protected]>
482481
Karl-Philipp Richter <[email protected]>
@@ -530,10 +529,10 @@ Lucas Diniz <[email protected]>
530529
Lucas Tierney <[email protected]>
531530
Luis Correia <[email protected]>
532531
Luis Pflamminger <[email protected]>
533-
Lukáš Linhart <[email protected]>
534532
Luke Hill <[email protected]>
535533
Luke Inman-Semerau <[email protected]>
536534
lukec <[email protected]>
535+
Lukáš Linhart <[email protected]>
537536
Lyudmil Latinov <[email protected]>
538537
Machinexa2 <[email protected]>
539538
Maciej Pakulski <[email protected]>
@@ -809,15 +808,16 @@ Stuart Knightly <[email protected]>
809808
sufyanAbbasi <[email protected]>
810809
sugama <[email protected]>
811810
sunnyyukaige <[email protected]>
811+
Swastik Baranwal <[email protected]>
812812
symonk <[email protected]>
813813
Take <[email protected]>
814814
take0x <[email protected]>
815815
Takeshi Kishi <[email protected]>
816816
Takuho NAKANO <[email protected]>
817817
Takuma Chiba <[email protected]>
818-
Tamás Buka <[email protected]>
819818
Tamas Utasi <[email protected]>
820819
Tamsil Sajid Amani <[email protected]>
820+
Tamás Buka <[email protected]>
821821
Tatsuya Hoshino <[email protected]>
822822
Terence Haddock
823823
thecr8tr <[email protected]>
@@ -860,7 +860,6 @@ Ulf Adams <[email protected]>
860860
Ulrich Buchgraber <[email protected]>
861861
User253489 <[email protected]>
862862
V24 <[email protected]>
863-
Václav Votípka <[email protected]>
864863
Valery Yatsynovich <[email protected]>
865864
Varun Menon <[email protected]>
866865
varunsurapaneni <[email protected]>
@@ -885,6 +884,7 @@ Vladimir Támara Patiño <[email protected]>
885884
VladimirPodolyan <[email protected]>
886885
Vladislav Velichko <[email protected]>
887886
Vyvyan Codd
887+
Václav Votípka <[email protected]>
888888
Werner Robitza <[email protected]>
889889
wiggin15 <[email protected]>
890890
wildloop <[email protected]>
@@ -906,4 +906,6 @@ Zhuo Peng <[email protected]>
906906
Ziyu <[email protected]>
907907
Zoltar - Knower of All
908908
zsong <[email protected]>
909+
Ákos Lukács <[email protected]>
910+
Étienne Barrié <[email protected]>
909911
保木本将之 <[email protected]>

‎MODULE.bazel

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.7.9")
5-
bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1")
6-
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
7-
bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
5+
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
6+
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
7+
bazel_dep(name = "aspect_rules_ts", version = "3.1.0")
88
bazel_dep(name = "bazel_features", version = "1.13.0")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
@@ -18,7 +18,7 @@ bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name
1818
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.15.1")
21-
bazel_dep(name = "rules_java", version = "7.6.3")
21+
bazel_dep(name = "rules_java", version = "7.11.1")
2222
bazel_dep(name = "rules_jvm_external", version = "6.3")
2323
bazel_dep(name = "rules_nodejs", version = "6.2.0")
2424
bazel_dep(name = "rules_oci", version = "1.7.6")
@@ -169,7 +169,7 @@ maven.install(
169169
name = "maven",
170170
artifacts = [
171171
"com.beust:jcommander:1.82",
172-
"com.github.javaparser:javaparser-core:3.26.1",
172+
"com.github.javaparser:javaparser-core:3.26.2",
173173
"com.github.spotbugs:spotbugs:4.8.6",
174174
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
175175
"com.google.code.gson:gson:2.11.0",
@@ -183,29 +183,29 @@ maven.install(
183183
"dev.failsafe:failsafe:3.3.2",
184184
"io.grpc:grpc-context:1.66.0",
185185
"io.lettuce:lettuce-core:6.4.0.RELEASE",
186-
"io.netty:netty-buffer:4.1.112.Final",
187-
"io.netty:netty-codec-http:4.1.112.Final",
188-
"io.netty:netty-codec-http2:4.1.112.Final",
189-
"io.netty:netty-common:4.1.112.Final",
190-
"io.netty:netty-handler:4.1.112.Final",
191-
"io.netty:netty-handler-proxy:4.1.112.Final",
192-
"io.netty:netty-transport:4.1.112.Final",
193-
"io.opentelemetry:opentelemetry-api:1.41.0",
194-
"io.opentelemetry:opentelemetry-context:1.41.0",
195-
"io.opentelemetry:opentelemetry-exporter-logging:1.41.0",
196-
"io.opentelemetry:opentelemetry-sdk:1.41.0",
197-
"io.opentelemetry:opentelemetry-sdk-common:1.41.0",
198-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.41.0",
199-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.41.0",
200-
"io.opentelemetry:opentelemetry-sdk-testing:1.41.0",
201-
"io.opentelemetry:opentelemetry-sdk-trace:1.41.0",
186+
"io.netty:netty-buffer:4.1.113.Final",
187+
"io.netty:netty-codec-http:4.1.113.Final",
188+
"io.netty:netty-codec-http2:4.1.113.Final",
189+
"io.netty:netty-common:4.1.113.Final",
190+
"io.netty:netty-handler:4.1.113.Final",
191+
"io.netty:netty-handler-proxy:4.1.113.Final",
192+
"io.netty:netty-transport:4.1.113.Final",
193+
"io.opentelemetry:opentelemetry-api:1.42.1",
194+
"io.opentelemetry:opentelemetry-context:1.42.1",
195+
"io.opentelemetry:opentelemetry-exporter-logging:1.42.1",
196+
"io.opentelemetry:opentelemetry-sdk:1.42.1",
197+
"io.opentelemetry:opentelemetry-sdk-common:1.42.1",
198+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.42.1",
199+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.42.1",
200+
"io.opentelemetry:opentelemetry-sdk-testing:1.42.1",
201+
"io.opentelemetry:opentelemetry-sdk-trace:1.42.1",
202202
"io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
203203
"io.ous:jtoml:2.0.0",
204204
"it.ozimov:embedded-redis:0.7.3",
205-
"net.bytebuddy:byte-buddy:1.15.0",
205+
"net.bytebuddy:byte-buddy:1.15.1",
206206
"org.htmlunit:htmlunit-core-js:4.4.0",
207207
"org.apache.commons:commons-exec:1.4.0",
208-
"org.apache.logging.log4j:log4j-core:2.23.1",
208+
"org.apache.logging.log4j:log4j-core:2.24.0",
209209
"org.assertj:assertj-core:3.26.3",
210210
"org.bouncycastle:bcpkix-jdk18on:1.78.1",
211211
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
@@ -218,8 +218,8 @@ maven.install(
218218
"org.junit.platform:junit-platform-reporting:1.11.0",
219219
"org.junit.platform:junit-platform-commons:1.11.0",
220220
"org.junit.platform:junit-platform-engine:1.11.0",
221-
"org.mockito:mockito-core:5.12.0",
222-
"org.redisson:redisson:3.35.0",
221+
"org.mockito:mockito-core:5.13.0",
222+
"org.redisson:redisson:3.36.0",
223223
"org.slf4j:slf4j-api:2.0.16",
224224
"org.slf4j:slf4j-jdk14:2.0.16",
225225
"org.zeromq:jeromq:0.6.0",

‎Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ JAVA_RELEASE_TARGETS = %w[
9898
//java/src/org/openqa/selenium/chrome:chrome.publish
9999
//java/src/org/openqa/selenium/chromium:chromium.publish
100100
//java/src/org/openqa/selenium/devtools/v128:v128.publish
101-
//java/src/org/openqa/selenium/devtools/v126:v126.publish
101+
//java/src/org/openqa/selenium/devtools/v129:v129.publish
102102
//java/src/org/openqa/selenium/devtools/v127:v127.publish
103103
//java/src/org/openqa/selenium/devtools/v85:v85.publish
104104
//java/src/org/openqa/selenium/edge:edge.publish

‎common/devtools/chromium/v126/BUILD.bazel ‎common/devtools/chromium/v129/BUILD.bazel

File renamed without changes.

0 commit comments

Comments
 (0)