Skip to content

Commit 421d9df

Browse files
authored
Merge branch 'trunk' into py_use_env_driver_location
2 parents 7e57ab7 + 419484d commit 421d9df

File tree

4 files changed

+11
-32
lines changed

4 files changed

+11
-32
lines changed

.github/workflows/update-documentation.yml

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -194,47 +194,26 @@ jobs:
194194
uses: actions/checkout@v4
195195
with:
196196
ref: 'gh-pages'
197+
fetch-depth: 0
198+
fetch-tags: true
197199
- name: Create and checkout new branch
198200
run: |
199201
git config --local user.email "[email protected]"
200202
git config --local user.name "Selenium CI Bot"
201203
git checkout -b api-docs-${{ inputs.tag }}
202-
- name: Download Java patch
203-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
204-
uses: actions/download-artifact@v4
205-
with:
206-
name: java-docs-patch
207-
path: patches/
208-
- name: Download Ruby patch
209-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
210-
uses: actions/download-artifact@v4
211-
with:
212-
name: ruby-docs-patch
213-
path: patches/
214-
- name: Download Python patch
215-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
204+
- name: Download all patches
216205
uses: actions/download-artifact@v4
217206
with:
218-
name: python-docs-patch
219-
path: patches/
220-
- name: Download .NET patch
221-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
222-
uses: actions/download-artifact@v4
223-
with:
224-
name: dotnet-docs-patch
225-
path: patches/
226-
- name: Download Node patch
227-
if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
228-
uses: actions/download-artifact@v4
229-
with:
230-
name: node-docs-patch
231207
path: patches/
232208
merge-multiple: true
209+
- name: Show downloaded patches
210+
run: ls -lah patches/
233211
- name: Apply patches
234212
run: |
235213
for patch in patches/*.patch; do
236214
git am < "$patch"
237215
done
216+
rm -rf patches/
238217
- name: Push Branch
239218
run: git push origin api-docs-${{ inputs.tag }}
240219
- name: Documentation Pull Request

dotnet/src/webdriver/DevTools/DevToolsSession.cs

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 1 addition & 1 deletion
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 -->

0 commit comments

Comments
 (0)