Skip to content

Commit 0c1de49

Browse files
authored
Merge branch 'trunk' into add-python-bidi-log-examples
2 parents 122fe6c + dd77fb0 commit 0c1de49

12 files changed

Lines changed: 43 additions & 35 deletions

File tree

.github/workflows/dotnet-examples.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
paths:
1616
- 'examples/dotnet/**'
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
1822
env:
1923
DISPLAY: :99
2024
GITHUB_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
@@ -25,7 +29,7 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
28-
os: [ ubuntu, windows, macos ]
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
2933
release: [ stable, nightly ]
3034
runs-on: ${{ format('{0}-latest', matrix.os) }}
3135
steps:

.github/workflows/java-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
os: [ ubuntu, windows, macos ]
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
3333
release: [ stable, nightly ]
3434
runs-on: ${{ format('{0}-latest', matrix.os) }}
3535
steps:

.github/workflows/js-examples.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
paths:
1616
- 'examples/javascript/**'
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
1822
env:
1923
DISPLAY: :99
2024
GITHUB_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
@@ -25,7 +29,7 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
28-
os: [ ubuntu, windows, macos ]
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
2933
release: [ stable, nightly ]
3034
runs-on: ${{ format('{0}-latest', matrix.os) }}
3135
steps:

.github/workflows/kotlin-examples.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
paths:
1616
- 'examples/kotlin/**'
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
1822
env:
1923
DISPLAY: :99
2024
GITHUB_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
@@ -25,7 +29,7 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
28-
os: [ ubuntu, windows, macos ]
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
2933
runs-on: ${{ format('{0}-latest', matrix.os) }}
3034
steps:
3135
- name: Checkout GitHub repo

.github/workflows/python-examples.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
paths:
1616
- 'examples/python/**'
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
1822
env:
1923
DISPLAY: :99
2024
GITHUB_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
@@ -25,24 +29,12 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
33+
release: [ stable, nightly ]
2834
include:
29-
- os: ubuntu
30-
release: stable
31-
python: '3.10'
32-
- os: ubuntu
33-
release: nightly
34-
python: '3.14'
35-
- os: windows
36-
release: stable
37-
python: '3.10'
38-
- os: windows
39-
release: nightly
40-
python: '3.14'
41-
- os: macos
42-
release: stable
35+
- release: stable
4336
python: '3.10'
44-
- os: macos
45-
release: nightly
37+
- release: nightly
4638
python: '3.14'
4739
runs-on: ${{ format('{0}-latest', matrix.os) }}
4840
steps:

.github/workflows/ruby-examples.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
paths:
1616
- 'examples/ruby/**'
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: true
21+
1822
env:
1923
DISPLAY: :99
2024
GITHUB_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
@@ -25,7 +29,7 @@ jobs:
2529
strategy:
2630
fail-fast: false
2731
matrix:
28-
os: [ ubuntu, windows, macos ]
32+
os: ${{ (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && fromJSON('["ubuntu", "windows", "macos"]') || fromJSON('["ubuntu", "windows"]') }}
2933
release: [ stable, nightly ]
3034
runs-on: ${{ format('{0}-latest', matrix.os) }}
3135
steps:

examples/dotnet/SeleniumDocs/BaseTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class BaseTest
1717
protected IWebDriver driver;
1818
protected Uri GridUrl;
1919
private Process _webserverProcess;
20-
private const string ServerJarName = "selenium-server-4.43.0.jar";
20+
private const string ServerJarName = "selenium-server-4.44.0.jar";
2121
private static readonly string BaseDirectory = AppContext.BaseDirectory;
2222
private const string RelativePathToGrid = "../../../../../";
2323
private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

examples/python/tests/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def server_old(request):
149149
os.path.abspath(__file__)
150150
)
151151
),
152-
"selenium-server-4.43.0.jar",
152+
"selenium-server-4.44.0.jar",
153153
)
154154

155155
def wait_for_server(url, timeout):
@@ -207,7 +207,7 @@ def server():
207207
)
208208
)
209209
),
210-
"selenium-server-4.43.0.jar",
210+
"selenium-server-4.44.0.jar",
211211
)
212212

213213
args = [
@@ -280,7 +280,7 @@ def grid_server():
280280
)
281281
)
282282
),
283-
"selenium-server-4.43.0.jar",
283+
"selenium-server-4.44.0.jar",
284284
)
285285

286286
args = [

examples/ruby/spec/drivers/remote_webdriver_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
let(:target_directory) { File.join(Dir.tmpdir, SecureRandom.uuid) }
88
let(:wait) { Selenium::WebDriver::Wait.new(timeout: 2) }
99
let(:server) do
10-
Selenium::Server.new(File.expand_path(File.join('..', '..', '..', 'selenium-server-4.43.0.jar'), __dir__),
10+
Selenium::Server.new(File.expand_path(File.join('..', '..', '..', 'selenium-server-4.44.0.jar'), __dir__),
1111
background: true,
1212
args: %w[--selenium-manager true --enable-managed-downloads true])
1313
end

0 commit comments

Comments
 (0)