Skip to content

Commit 853eb62

Browse files
Merge branch 'trunk' into json-converters
2 parents 12c6553 + a072f1b commit 853eb62

File tree

28 files changed

+382
-398
lines changed

28 files changed

+382
-398
lines changed

.bazelrc.remote

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ build:remote --disk_cache=
3131
build:remote --incompatible_enable_cc_toolchain_resolution
3232
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3333
test:remote --test_env=DISPLAY=:99.0
34-
test:remote --test_tag_filters=-exclusive-if-local,-skip-remote,-remote
34+
test:remote --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
3535

3636
# Env vars we can hard code
3737
build:remote --action_env=HOME=/home/dev

.github/workflows/pre-release.yml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,38 @@ jobs:
7878
run: |
7979
git config --local user.email "[email protected]"
8080
git config --local user.name "Selenium CI Bot"
81-
- name: Update everything including early release CDP
82-
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
83-
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]
84-
- name: Update everything including released CDP
85-
if: ${{ github.event.inputs.chrome_channel == 'stable' }}
86-
run: ./go "all:prepare[${{ github.event.inputs.version }},Stable]"
81+
- name: Update browser versions
82+
run: ./go update_browsers[${{ github.event.inputs.chrome_channel }}]
83+
- name: Commit browser updates
84+
run: git commit -m "update pinned browser versions"
85+
- name: Update devtools versions
86+
run: ./go all:update_cdp[${{ github.event.inputs.chrome_channel }}]
87+
- name: Commit DevTools updates
88+
run: git commit -m "update devtools versions"
89+
- name: Update Selenium Manager versions
90+
run: ./go update_manager
91+
- name: Commit Selenium Manager updates
92+
run: git commit -m "update selenium manager versions"
93+
- name: Update Maven dependency versions
94+
run: ./go java:update
95+
- name: Commit Maven version updates
96+
run: git commit -m "update maven dependency versions"
97+
- name: Update Authors file
98+
run: ./go authors
99+
- name: Commit Authors updates
100+
run: git commit -m "update authors file"
101+
- name: Bump minor version
102+
run: ./go all:version
103+
- name: Commit version updates
104+
run: git commit -m "bump versions in preparation for release"
105+
- name: Update changelog
106+
run: ./go all:changelog
107+
- name: Commit changelog updates
108+
run: git commit -m "WIP - rough auto-update of changelog, please edit"
109+
- name: List untracked files
110+
run: git status -u
111+
- name: Clean working directory before PR
112+
run: git clean -fd
87113
- name: Create Pull Request
88114
uses: peter-evans/create-pull-request@v6
89115
with:

.github/workflows/update-documentation.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,24 @@ env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838

3939
jobs:
40+
determine-languages:
41+
runs-on: ubuntu-latest
42+
outputs:
43+
matrix: ${{ steps.set-matrix.outputs.matrix }}
44+
steps:
45+
- id: set-matrix
46+
run: |
47+
if [ "${{ inputs.language }}" == "all" ]; then
48+
echo 'matrix={"language":["java","rb","py","dotnet","node"]}' >> $GITHUB_OUTPUT
49+
else
50+
echo 'matrix={"language":["${{ inputs.language }}"]}' >> $GITHUB_OUTPUT
51+
fi
4052
build-docs:
53+
needs: determine-languages
4154
runs-on: ubuntu-latest
55+
strategy:
56+
matrix: ${{ fromJson(needs.determine-languages.outputs.matrix) }}
57+
fail-fast: false
4258
steps:
4359
- name: Checkout repository
4460
uses: actions/checkout@v4
@@ -58,34 +74,35 @@ jobs:
5874
java-version: 17
5975
distribution: 'temurin'
6076
- name: Set up Python 3.9
61-
if: ${{ inputs.language == 'all' || inputs.language == 'py' }}
77+
if: ${{ matrix.language == 'py' }}
6278
uses: actions/setup-python@v5
6379
with:
6480
python-version: 3.9
6581
- name: Install dependencies
66-
if: ${{ inputs.language == 'all' || inputs.language == 'py' }}
82+
if: ${{ matrix.language == 'py' }}
6783
run: |
6884
python -m pip install --upgrade pip
6985
pip install tox
7086
- name: Install npm dependencies
71-
if: ${{ inputs.language == 'all' || inputs.language == 'node' }}
87+
if: ${{ matrix.language == 'node' }}
7288
run: |
7389
npm install
7490
npm install --prefix javascript/node/selenium-webdriver
7591
- name: Update Documentation
76-
run: ./go ${{ inputs.language }}:docs
77-
92+
run: ./go ${{ matrix.language }}:docs
7893
- name: Documentation Pull Request
7994
uses: peter-evans/create-pull-request@v6
8095
with:
8196
token: ${{ secrets.SELENIUM_CI_TOKEN }}
8297
author: Selenium CI Bot <[email protected]>
8398
delete-branch: true
84-
branch: api-docs-${{ inputs.version }}-${{ inputs.language }}
99+
branch: api-docs-${{ inputs.version }}-${{ matrix.language }}
85100
base: gh-pages
86-
title: Update documentation for Selenium ${{ inputs.version }} (${{ inputs.language }})
101+
add-paths: |
102+
${{ matrix.language == 'node' && 'docs/api/javascript/**' || format('docs/api/{0}/**', matrix.language) }}
103+
title: Update documentation for Selenium ${{ inputs.version }} (${{ matrix.language }})
87104
body: |
88-
This PR updates the API documentation for **${{ inputs.language }}** language bindings to version **${{ inputs.version }}**.
105+
This PR updates the API documentation for **${{ matrix.language }}** language bindings to version **${{ inputs.version }}**.
89106
90107
- Auto-generated by [create-pull-request][1]
91108

0 commit comments

Comments
 (0)