Skip to content

Commit 1eb4055

Browse files
authored
Merge branch 'trunk' into case-insensitive-hrader-name
2 parents d747a3c + 00a3f4c commit 1eb4055

File tree

451 files changed

+11789
-11598
lines changed

Some content is hidden

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

451 files changed

+11789
-11598
lines changed

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ build --nobuild_runfile_links
3939

4040
# More JS magic
4141
build --experimental_allow_unresolved_symlinks
42+
# Avoid a warning about directory tracking being unsound
43+
startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
4244

4345
# Required for faster TS builds
4446
build --@aspect_rules_ts//ts:skipLibCheck=always

.github/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
-dependencies
5+
authors:
6+
- selenium-ci

.github/workflows/bazel.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,6 @@ jobs:
143143
- name: Set resolution
144144
if: inputs.os == 'windows' && inputs.browser != ''
145145
run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
146-
- name: Setup Chrome
147-
if: inputs.browser == 'chrome'
148-
uses: browser-actions/setup-chrome@latest
149-
with:
150-
chrome-version: ${{ inputs.browser-version || 'stable' }}
151-
- name: Setup Firefox
152-
if: inputs.browser == 'firefox'
153-
uses: abhi1693/[email protected]
154-
with:
155-
browser: firefox
156-
version: ${{ inputs.browser-version || 'latest' }}
157-
- name: Setup Edge
158-
if: inputs.browser == 'edge'
159-
uses: browser-actions/setup-edge@latest
160-
with:
161-
edge-version: ${{ inputs.browser-version || 'stable' }}
162146
- name: Setup Safari
163147
if: inputs.browser == 'safari'
164148
run: sudo safaridriver --enable

.github/workflows/ci-javascript.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/ci-ruby.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,9 @@ jobs:
7474
- edge
7575
- firefox
7676
os:
77-
- ubuntu
7877
- windows
7978
- macos
8079
exclude:
81-
- browser: edge
82-
os: ubuntu
8380
- browser: edge
8481
os: macos
8582
with:
@@ -94,6 +91,7 @@ jobs:
9491
--local_test_jobs 1
9592
--test_size_filters large
9693
--test_tag_filters ${{ matrix.browser }}
94+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
9795
//rb/spec/...
9896
9997
integration-tests-remote:
@@ -106,10 +104,6 @@ jobs:
106104
include:
107105
- browser: edge
108106
os: windows
109-
- browser: chrome
110-
os: ubuntu
111-
- browser: firefox
112-
os: ubuntu
113107
with:
114108
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
115109
browser: ${{ matrix.browser }}
@@ -123,4 +117,5 @@ jobs:
123117
--local_test_jobs 1
124118
--test_size_filters large
125119
--test_tag_filters ${{ matrix.browser }}-remote
120+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
126121
//rb/spec/...

.github/workflows/ci.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ jobs:
5959
contains(join(github.event.commits.*.message), '[java]') ||
6060
contains(github.event.pull_request.title, '[java]')
6161
62-
javascript:
63-
name: JavaScript
64-
needs: check
65-
uses: ./.github/workflows/ci-javascript.yml
66-
if: >
67-
github.event_name == 'schedule' ||
68-
github.event_name == 'workflow_dispatch' ||
69-
contains(needs.check.outputs.targets, '//javascript') ||
70-
contains(join(github.event.commits.*.message), '[js]') ||
71-
contains(github.event.pull_request.title, '[js]')
72-
7362
python:
7463
name: Python
7564
needs: check

.github/workflows/nightly.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
with:
3636
name: Nightly Ruby Release
3737
cache-key: rb-nightly-${{ matrix.gem }}
38-
env:
39-
GEM_HOST_API_KEY: "Bearer $GITHUB_TOKEN"
40-
run: ./go rb:release['nightly', '--config=release']
38+
run: |
39+
export GEM_HOST_API_KEY="Bearer $GITHUB_TOKEN"
40+
./go rb:release[nightly]
4141
on-ruby-failure:
4242
name: On Ruby Failure
4343
runs-on: ubuntu-latest
@@ -63,7 +63,7 @@ jobs:
6363
with:
6464
name: Nightly Python Release
6565
cache-key: python-nightly
66-
run: ./go py:release['nightly', '--config=release']
66+
run: ./go py:release[nightly]
6767
secrets: inherit
6868
on-python-failure:
6969
name: On Python Failure
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
name: Nightly Java Release
9292
cache-key: java-nightly
93-
run: ./go publish-maven-snapshot
93+
run: ./go java:release[nightly]
9494
secrets: inherit
9595
on-java-failure:
9696
name: On Java Failure
@@ -118,7 +118,7 @@ jobs:
118118
name: Nightly DotNet Release
119119
cache-key: dotnet-nightly
120120
dotnet-version: '6.x'
121-
run: ./go dotnet:release['nightly', '--config=release']
121+
run: ./go dotnet:release[--stamp,nightly]
122122
secrets: inherit
123123
on-dotnet-failure:
124124
name: On .NET Failure
@@ -179,7 +179,7 @@ jobs:
179179
echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
180180
echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
181181
echo "always-auth=true" >> ~/.npmrc
182-
./go node:release['nightly', '--config=release']
182+
./go node:release[--stamp,nightly]
183183
secrets: inherit
184184
on-javascript-failure:
185185
name: On JavaScript Failure

.github/workflows/pre-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
git checkout -b release-${{ github.event.inputs.version }}
3737
- name: Update Rust Version
3838
run: |
39-
./go rust:version
39+
./go rust:version[${{ github.event.inputs.version }}]
4040
./go rust:version:commit
4141
- name: Push changes
4242
uses: ad-m/github-push-action@master
@@ -68,7 +68,7 @@ jobs:
6868
fetch-tags: true
6969
ref: release-${{ github.event.inputs.version }}
7070
- name: Install Ruby
71-
uses: ruby/setup-ruby@d5fb7a202fc07872cb44f00ba8e6197b70cb0c55
71+
uses: ruby/setup-ruby@v1
7272
with:
7373
ruby-version: '3.1'
7474
working-directory: 'rb'
@@ -80,10 +80,10 @@ jobs:
8080
run: git reset HEAD~1
8181
- name: Update everything including early release CDP
8282
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
83-
run: ./go all:prepare['Beta']
83+
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]
8484
- name: Update everything including released CDP
8585
if: ${{ github.event.inputs.chrome_channel == 'stable' }}
86-
run: ./go "all:prepare[Stable]"
86+
run: ./go "all:prepare[${{ github.event.inputs.version }},Stable]"
8787
- name: Create Pull Request
8888
uses: peter-evans/create-pull-request@v6
8989
with:
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Release Staging
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
7+
env:
8+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9+
10+
jobs:
11+
github-release:
12+
if: >
13+
github.event.pull_request.merged == true &&
14+
github.repository_owner == 'seleniumhq' &&
15+
startsWith(github.event.pull_request.head.ref, 'release-preparation-')
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout repo
19+
uses: actions/checkout@v4
20+
- name: Extract version from branch name
21+
id: extract_version
22+
run: |
23+
BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
24+
VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
25+
echo "VERSION=$VERSION" >> $GITHUB_ENV
26+
- name: Prep git
27+
run: |
28+
git config --local user.email "[email protected]"
29+
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
40+
- name: Setup Java
41+
uses: actions/setup-java@v3
42+
with:
43+
java-version: 17
44+
distribution: 'temurin'
45+
- name: Build and Stage Packages
46+
run: ./go all:package[--config=release]
47+
- name: Generate Draft Release
48+
uses: softprops/action-gh-release@v2
49+
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 }}
56+
draft: true
57+
generate_release_notes: true
58+
prerelease: false
59+
files: build/dist/*.*
60+
61+
update-documentation:
62+
needs: github-release
63+
uses: ./.github/workflows/update-documentation.yml
64+
with:
65+
tag: selenium-${{ needs.github-release.outputs.version }}

0 commit comments

Comments
 (0)