Skip to content

Commit 5583c4b

Browse files
Delta456Delta456
authored
Merge branch 'trunk' into sm_check_browser_version
2 parents db8f912 + 419484d commit 5583c4b

File tree

18 files changed

+64
-99
lines changed

18 files changed

+64
-99
lines changed

‎.github/workflows/stage-release.yml

+4-22
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
github.event.inputs.version != '' &&
2424
github.repository_owner == 'seleniumhq')
2525
runs-on: ubuntu-latest
26+
permissions: write-all
2627
steps:
2728
- name: Checkout repo
2829
uses: actions/checkout@v4
@@ -53,37 +54,18 @@ jobs:
5354
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
5455
- name: Build and Stage Packages
5556
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
6257
- name: Generate Draft Release
6358
uses: ncipollo/release-action@v1
6459
with:
6560
artifacts: "build/dist/*.*"
6661
bodyFile: "scripts/github-actions/release_header.md"
6762
draft: true
6863
generateReleaseNotes: true
69-
name: Selenium ${{ env.VERSION }}
64+
name: "Selenium ${{ env.VERSION }}"
7065
prerelease: false
7166
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/*.*
67+
tag: "selenium-${{ env.VERSION }}"
68+
commit: "${{ github.sha }}"
8769

8870
update-documentation:
8971
needs: github-release

‎.github/workflows/update-documentation.yml

+18-36
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
git config --local user.email "[email protected]"
4747
git config --local user.name "Selenium CI Bot"
4848
- name: Setup Java
49-
uses: actions/setup-java@v3
49+
uses: actions/setup-java@v4
5050
with:
5151
java-version: 17
5252
distribution: 'temurin'
@@ -58,7 +58,7 @@ jobs:
5858
git format-patch -1 HEAD --stdout > java-docs.patch
5959
- name: Upload patch
6060
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
61-
uses: actions/upload-artifact@v2
61+
uses: actions/upload-artifact@v4
6262
with:
6363
name: java-docs-patch
6464
path: java-docs.patch
@@ -76,10 +76,12 @@ jobs:
7676
git config --local user.email "[email protected]"
7777
git config --local user.name "Selenium CI Bot"
7878
- name: Setup Java
79-
uses: actions/setup-java@v3
79+
uses: actions/setup-java@v4
8080
with:
8181
java-version: 17
8282
distribution: 'temurin'
83+
- name: Setup curl for Ubuntu
84+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
8385
- name: Update Documentation
8486
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
8587
run: ./go rb:docs
@@ -88,7 +90,7 @@ jobs:
8890
git format-patch -1 HEAD --stdout > ruby-docs.patch
8991
- name: Upload patch
9092
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
91-
uses: actions/upload-artifact@v2
93+
uses: actions/upload-artifact@v4
9294
with:
9395
name: ruby-docs-patch
9496
path: ruby-docs.patch
@@ -106,7 +108,7 @@ jobs:
106108
git config --local user.email "[email protected]"
107109
git config --local user.name "Selenium CI Bot"
108110
- name: Set up Python 3.8
109-
uses: actions/setup-python@v4
111+
uses: actions/setup-python@v5
110112
with:
111113
python-version: 3.8
112114
- name: Install dependencies
@@ -121,7 +123,7 @@ jobs:
121123
git format-patch -1 HEAD --stdout > python-docs.patch
122124
- name: Upload patch
123125
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
124-
uses: actions/upload-artifact@v2
126+
uses: actions/upload-artifact@v4
125127
with:
126128
name: python-docs-patch
127129
path: python-docs.patch
@@ -150,7 +152,7 @@ jobs:
150152
git format-patch -1 HEAD --stdout > dotnet-docs.patch
151153
- name: Upload patch
152154
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
153-
uses: actions/upload-artifact@v2
155+
uses: actions/upload-artifact@v4
154156
with:
155157
name: dotnet-docs-patch
156158
path: dotnet-docs.patch
@@ -179,7 +181,7 @@ jobs:
179181
git format-patch -1 HEAD --stdout > node-docs.patch
180182
- name: Upload patch
181183
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
182-
uses: actions/upload-artifact@v2
184+
uses: actions/upload-artifact@v4
183185
with:
184186
name: node-docs-patch
185187
path: node-docs.patch
@@ -192,46 +194,26 @@ jobs:
192194
uses: actions/checkout@v4
193195
with:
194196
ref: 'gh-pages'
197+
fetch-depth: 0
198+
fetch-tags: true
195199
- name: Create and checkout new branch
196200
run: |
197201
git config --local user.email "[email protected]"
198202
git config --local user.name "Selenium CI Bot"
199203
git checkout -b api-docs-${{ inputs.tag }}
200-
- name: Download Java patch
201-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
202-
uses: actions/download-artifact@v2
203-
with:
204-
name: java-docs-patch
205-
path: patches/
206-
- name: Download Ruby patch
207-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
208-
uses: actions/download-artifact@v2
209-
with:
210-
name: ruby-docs-patch
211-
path: patches/
212-
- name: Download Python patch
213-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
214-
uses: actions/download-artifact@v2
204+
- name: Download all patches
205+
uses: actions/download-artifact@v4
215206
with:
216-
name: python-docs-patch
217-
path: patches/
218-
- name: Download .NET patch
219-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
220-
uses: actions/download-artifact@v2
221-
with:
222-
name: dotnet-docs-patch
223-
path: patches/
224-
- name: Download Node patch
225-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
226-
uses: actions/download-artifact@v2
227-
with:
228-
name: node-docs-patch
229207
path: patches/
208+
merge-multiple: true
209+
- name: Show downloaded patches
210+
run: ls -lah patches/
230211
- name: Apply patches
231212
run: |
232213
for patch in patches/*.patch; do
233214
git am < "$patch"
234215
done
216+
rm -rf patches/
235217
- name: Push Branch
236218
run: git push origin api-docs-${{ inputs.tag }}
237219
- name: Documentation Pull Request

‎common/mirror/selenium

+23-23
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,33 @@
33
"tag_name": "nightly",
44
"assets": [
55
{
6-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.25.0.zip"
6+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.26.0-SNAPSHOT.zip"
77
},
88
{
9-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.25.0.jar"
9+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.jar"
1010
},
1111
{
12-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.25.0.zip"
12+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.zip"
13+
}
14+
]
15+
},
16+
{
17+
"tag_name": "selenium-4.25.0",
18+
"assets": [
19+
{
20+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-dotnet-4.25.0.zip"
21+
},
22+
{
23+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-dotnet-strongnamed-4.25.0.zip"
24+
},
25+
{
26+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-java-4.25.0.zip"
27+
},
28+
{
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-server-4.25.0.jar"
30+
},
31+
{
32+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-server-4.25.0.zip"
1333
}
1434
]
1535
},
@@ -938,25 +958,5 @@
938958
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-server-4.0.0-rc-1.zip"
939959
}
940960
]
941-
},
942-
{
943-
"tag_name": "selenium-4.0.0-beta-4",
944-
"assets": [
945-
{
946-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-dotnet-4.0.0-beta-4.zip"
947-
},
948-
{
949-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-dotnet-strongnamed-4.0.0-beta-4.zip"
950-
},
951-
{
952-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-html-runner-4.0.0-beta-4.jar"
953-
},
954-
{
955-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-java-4.0.0-beta-4.zip"
956-
},
957-
{
958-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-server-4.0.0-beta-4.jar"
959-
}
960-
]
961961
}
962962
]

‎dotnet/selenium-dotnet-version.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BUILD FILE SYNTAX: STARLARK
22

3-
SE_VERSION = "4.25.0"
3+
SE_VERSION = "4.26.0-nightly202409202352"
44
ASSEMBLY_VERSION = "4.0.0.0"
55
SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
66

‎dotnet/src/webdriver/DevTools/DevToolsSession.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
301301
LogTrace("Recieved Error Response {0}: {1} {2}", modified.CommandId, message, errorData);
302302
throw new CommandResponseException(exceptionMessage)
303303
{
304-
Code = modified.Result["code"].GetValue<long>()
304+
Code = modified.Result["code"]?.GetValue<long>() ?? -1
305305
};
306306
}
307307

‎dotnet/src/webdriver/WebDriver.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
</ItemGroup>
7272

7373
<Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="PrepareForBuild">
74-
<Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" />
74+
<Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" WorkingDirectory="../../.." />
7575

7676
<PropertyGroup>
7777
<BaseSeleniumManagerPath>..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
7878
</PropertyGroup>
7979
</Target>
8080

8181
<Target Name="GenerateAtoms" BeforeTargets="PrepareForBuild">
82-
<Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js" />
82+
<Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js" WorkingDirectory="../../.." />
8383

8484
<ItemGroup>
8585
<EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
@@ -106,7 +106,7 @@
106106
</Target>
107107

108108
<Target Name="GenerateCdp" BeforeTargets="CoreCompile">
109-
<Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" />
109+
<Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" WorkingDirectory="../../.." />
110110

111111
<ItemGroup>
112112
<Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />

‎dotnet/test/common/WebDriver.Common.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<Target Name="BuildTestWebServer" AfterTargets="AfterBuild">
37-
<Exec Command="bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar" />
37+
<Exec Command="bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar" WorkingDirectory="../../.." />
3838
</Target>
3939

4040
<!-- It is automatically imported when Selenium.WebDriver consumed via nuget package -->

‎java/version.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SE_VERSION = "4.25.0"
1+
SE_VERSION = "4.26.0-SNAPSHOT"
22
TOOLS_JAVA_VERSION = "17"

‎javascript/node/selenium-webdriver/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ load("//javascript/private:browsers.bzl", "BROWSERS")
1111

1212
npm_link_all_packages(name = "node_modules")
1313

14-
VERSION = "4.25.0"
14+
VERSION = "4.26.0-nightly202409202352"
1515

1616
BROWSER_VERSIONS = [
1717
"v85",
@@ -63,6 +63,7 @@ npm_package(
6363
"//javascript/node/selenium-webdriver/lib/atoms:mutation-listener",
6464
],
6565
package = "selenium-webdriver",
66+
publishable = True,
6667
tags = [
6768
"release-artifact",
6869
],

‎javascript/node/selenium-webdriver/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "selenium-webdriver",
3-
"version": "4.25.0",
3+
"version": "4.26.0-nightly202409202352",
44
"description": "The official WebDriver JavaScript bindings from the Selenium project",
55
"license": "Apache-2.0",
66
"keywords": [

‎package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎py/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ compile_pip_requirements(
6262
],
6363
)
6464

65-
SE_VERSION = "4.25.0"
65+
SE_VERSION = "4.26.0.dev202409202351"
6666

6767
BROWSER_VERSIONS = [
6868
"v85",

‎py/docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
# built documents.
5757
#
5858
# The short X.Y version.
59-
version = '4.25'
59+
version = '4.26'
6060
# The full version, including alpha/beta/rc tags.
61-
release = '4.25.0'
61+
release = '4.26.0.dev202409202351'
6262

6363
# The language for content autogenerated by Sphinx. Refer to documentation
6464
# for a list of supported languages.

‎py/selenium/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717

1818

19-
__version__ = "4.25.0"
19+
__version__ = "4.26.0.dev202409202351"

‎py/selenium/webdriver/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from .wpewebkit.service import Service as WPEWebKitService # noqa
4545
from .wpewebkit.webdriver import WebDriver as WPEWebKit # noqa
4646

47-
__version__ = "4.25.0"
47+
__version__ = "4.26.0.dev202409202351"
4848

4949
# We need an explicit __all__ because the above won't otherwise be exported.
5050
__all__ = [

‎py/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
setup_args = {
2929
'cmdclass': {'install': install},
3030
'name': 'selenium',
31-
'version': "4.25.0",
31+
'version': "4.26.0.dev202409202351",
3232
'license': 'Apache 2.0',
3333
'description': 'Official Python bindings for Selenium WebDriver.',
3434
'long_description': open(join(abspath(dirname(__file__)), "README.rst")).read(),

‎rb/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
selenium-devtools (0.129.0)
55
selenium-webdriver (~> 4.2)
6-
selenium-webdriver (4.25.0)
6+
selenium-webdriver (4.26.0.nightly)
77
base64 (~> 0.2)
88
logger (~> 1.4)
99
rexml (~> 3.2, >= 3.2.5)

‎rb/lib/selenium/webdriver/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919

2020
module Selenium
2121
module WebDriver
22-
VERSION = '4.25.0'
22+
VERSION = '4.26.0.nightly'
2323
end # WebDriver
2424
end # Selenium

0 commit comments

Comments
 (0)