Skip to content

Commit a7a8b92

Browse files
aguspeaguspe
authored
Merge branch 'trunk' into expand_options_example_page
2 parents af36eaa + d51d29a commit a7a8b92

12 files changed

+108
-47
lines changed

‎.github/workflows/dotnet-examples.yml

+20-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,26 @@ jobs:
5656
dotnet-version: 6.x
5757
source-url: https://nuget.pkg.github.com/seleniumhq/index.json
5858
env:
59-
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
59+
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
60+
- name: Update Nightly version non-Windows
61+
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
62+
run:
63+
|
64+
latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver)
65+
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
66+
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
67+
env:
68+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
69+
- name: Update Nightly version Windows
70+
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
71+
shell: pwsh
72+
run:
73+
|
74+
$latest_nightly = ./scripts/latest-nightly-version.ps1 nuget Selenium.WebDriver
75+
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly
76+
dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly
77+
env:
78+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6079
- name: Set up Java
6180
uses: actions/setup-java@v4
6281
with:
@@ -70,5 +89,3 @@ jobs:
7089
command: |
7190
cd examples/dotnet/SeleniumDocs
7291
dotnet test
73-
env:
74-
SE_RELEASE: ${{ matrix.release }}

‎.github/workflows/java-examples.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ ubuntu-latest, windows-latest, macos-latest ]
29+
release: [ stable, nightly ]
2930
runs-on: ${{ matrix.os }}
3031
steps:
3132
- name: Checkout GitHub repo
@@ -48,11 +49,21 @@ jobs:
4849
with:
4950
distribution: 'temurin'
5051
java-version: 11
51-
- name: Run Tests
52+
- name: Run Tests Stable
53+
if: matrix.release == 'stable'
5254
uses: nick-invision/[email protected]
5355
with:
5456
timeout_minutes: 20
5557
max_attempts: 3
5658
command: |
5759
cd examples/java
5860
mvn -B test
61+
- name: Run Tests Nightly
62+
if: matrix.release == 'nightly'
63+
uses: nick-invision/[email protected]
64+
with:
65+
timeout_minutes: 20
66+
max_attempts: 3
67+
command: |
68+
cd examples/java
69+
mvn -B -U test -Dselenium.version=4.20.0-SNAPSHOT

‎.github/workflows/js-examples.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,22 @@ jobs:
9191
registry-url: 'https://npm.pkg.github.com'
9292
- name: Use Nightly package.json in Ubuntu/macOS
9393
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
94-
working-directory: ./examples/javascript
95-
run: mv package.nightly.json package.json
94+
run:
95+
|
96+
latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver)
97+
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
98+
env:
99+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
96101
- name: Use Nightly package.json in Windows
97102
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
98-
working-directory: ./examples/javascript
99-
run: Move-Item -Path package.nightly.json -Destination package.json -Force
103+
run:
104+
|
105+
$latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver
106+
npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly
107+
env:
108+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100110
- name: Install Requirements
101111
working-directory: ./examples/javascript
102112
run: npm install

‎.github/workflows/python-examples.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ ubuntu-latest, windows-latest, macos-latest ]
29+
release: [ stable, nightly ]
2930
runs-on: ${{ matrix.os }}
3031
steps:
3132
- name: Checkout GitHub repo
@@ -47,7 +48,15 @@ jobs:
4748
uses: actions/setup-python@v5
4849
with:
4950
python-version: 3.8
50-
- name: Install dependencies
51+
- name: Install dependencies nightly
52+
if: matrix.release == 'nightly'
53+
working-directory: ./examples/python
54+
run: |
55+
python -m pip install --upgrade pip
56+
pip install -r requirements.txt
57+
pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple --force-reinstall -v selenium
58+
- name: Install dependencies stable
59+
if: matrix.release == 'stable'
5160
working-directory: ./examples/python
5261
run: |
5362
python -m pip install --upgrade pip

‎.github/workflows/ruby-examples.yml

+25-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os: [ ubuntu-latest, windows-latest, macos-latest ]
29+
release: [ stable, nightly ]
2930
runs-on: ${{ matrix.os }}
3031
steps:
3132
- name: Checkout GitHub repo
@@ -48,7 +49,30 @@ jobs:
4849
with:
4950
ruby-version: 3.0
5051
bundler-cache: true
51-
- name: Install Gems
52+
- name: Install Gems Nightly non-Windows
53+
if: matrix.release == 'nightly' && matrix.os != 'windows-latest'
54+
run:
55+
|
56+
latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver)
57+
cd examples/ruby
58+
bundle install
59+
bundle remove selenium-webdriver
60+
bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq"
61+
env:
62+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
- name: Install Gems Nightly Windows
64+
if: matrix.release == 'nightly' && matrix.os == 'windows-latest'
65+
run:
66+
|
67+
$latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver
68+
cd examples/ruby
69+
bundle install
70+
bundle remove selenium-webdriver
71+
bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq"
72+
env:
73+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
- name: Install Gems Stable
75+
if: matrix.release == 'stable'
5276
working-directory: ./examples/ruby
5377
run: bundle install
5478
- name: Set up Java

‎examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
1111
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
1212
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
13-
</ItemGroup>
14-
15-
<ItemGroup Label="Nightly" Condition=" '$(SE_RELEASE)' == 'nightly' ">
16-
<PackageReference Include="Selenium.Support" Version="4.20.0-nightly202404181318" />
17-
<PackageReference Include="Selenium.WebDriver" Version="4.20.0-nightly202404181318" />
18-
</ItemGroup>
19-
20-
<ItemGroup Label="Stable" Condition=" '$(SE_RELEASE)' == 'stable' ">
2113
<PackageReference Include="Selenium.Support" Version="4.19.0" />
2214
<PackageReference Include="Selenium.WebDriver" Version="4.19.0" />
2315
</ItemGroup>

‎examples/java/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
<selenium.version>4.19.1</selenium.version>
1617
</properties>
1718

1819
<repositories>
@@ -29,12 +30,12 @@
2930
<dependency>
3031
<groupId>org.seleniumhq.selenium</groupId>
3132
<artifactId>selenium-java</artifactId>
32-
<version>4.19.1</version>
33+
<version>${selenium.version}</version>
3334
</dependency>
3435
<dependency>
3536
<groupId>org.seleniumhq.selenium</groupId>
3637
<artifactId>selenium-grid</artifactId>
37-
<version>4.19.1</version>
38+
<version>${selenium.version}</version>
3839
</dependency>
3940
<dependency>
4041
<groupId>org.junit.jupiter</groupId>

‎examples/javascript/package.nightly.json

-16
This file was deleted.

‎examples/ruby/Gemfile

+2-10
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,5 @@ gem 'rake', '~> 13.0'
77
gem 'rspec', '~> 3.0'
88
gem 'rubocop', '~> 1.35'
99
gem 'rubocop-rspec', '~> 2.12'
10-
gem 'selenium-devtools', '~> 0.122'
11-
12-
if ENV['SE_NIGHTLY']
13-
source 'https://rubygems.pkg.github.com/seleniumhq' do
14-
selenium = 'selenium-webdriver'
15-
gem selenium, '~> 4.19.0.nightly'
16-
end
17-
else
18-
gem 'selenium-webdriver', '= 4.19.0'
19-
end
10+
gem 'selenium-devtools', '= 0.123'
11+
gem 'selenium-webdriver', '= 4.19.0'

‎examples/ruby/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ DEPENDENCIES
7777
rspec (~> 3.0)
7878
rubocop (~> 1.35)
7979
rubocop-rspec (~> 2.12)
80-
selenium-devtools (~> 0.122)
80+
selenium-devtools (= 0.123)
8181
selenium-webdriver (= 4.19.0)
8282

8383
BUNDLED WITH

‎scripts/latest-nightly-version.ps1

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
$PACKAGE_TYPE = $args[0]
2+
$PACKAGE_NAME = $args[1]
3+
4+
$PATH_PACKAGES_API = "orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versions"
5+
$ACCEPT_HEADER = "Accept: application/vnd.github+json"
6+
$VERSION_HEADER = "X-GitHub-Api-Version: 2022-11-28"
7+
8+
$ghApiCommand = "gh api -H `"$ACCEPT_HEADER`" -H `"$VERSION_HEADER`" $PATH_PACKAGES_API | jq -r '.[0].name'"
9+
Invoke-Expression -Command $ghApiCommand

‎scripts/latest-nightly-version.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
PACKAGE_TYPE="$1"
6+
PACKAGE_NAME="$2"
7+
8+
PATH_PACKAGES_API="orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versions"
9+
ACCEPT_HEADER="Accept: application/vnd.github+json"
10+
VERSION_HEADER="X-GitHub-Api-Version: 2022-11-28"
11+
12+
gh api -H "$ACCEPT_HEADER" -H "$VERSION_HEADER" $PATH_PACKAGES_API | jq -r '.[0].name'

0 commit comments

Comments
 (0)