Skip to content

Commit 44ac082

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into video-manager
Signed-off-by: Viet Nguyen Duc <[email protected]>
2 parents afa58c7 + f7bc3fb commit 44ac082

File tree

273 files changed

+5381
-547
lines changed

Some content is hidden

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

273 files changed

+5381
-547
lines changed

.ffmpeg/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:noble AS builder
22
ARG FFMPEG_VERSION="7.1.1"
3-
ARG RCLONE_VER="v1.69.1"
3+
ARG RCLONE_VER="v1.69.2"
44
ARG GO_VERSION="latest"
55
ARG GO_CRYPTO_VERSION="v0.35.0"
66
ARG GO_OAUTH2_VERSION="v0.27.0"
7-
ARG GO_NET_VERSION="v0.36.0"
7+
ARG GO_NET_VERSION="v0.38.0"
88
ARG GOLANG_JWT_V4_VERSION="v4.5.2"
99
ARG GOLANG_JWT_V5_VERSION="v5.2.2"
1010

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ body:
5656
attributes:
5757
label: Docker Selenium version (image tag)
5858
description: What version of Docker Selenium are you using?
59-
placeholder: 4.30.0-20250323? Please use the full tag, avoid "latest"
59+
placeholder: 4.32.0-20250505? Please use the full tag, avoid "latest"
6060
validations:
6161
required: true
6262
- type: input

.github/actions/get-latest-upstream/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ runs:
2222
AUTH_HEADER="Authorization: token ${{ inputs.gh_cli_token }}"
2323
if [ "${{ inputs.release }}" = "true" ]; then
2424
echo "Getting the latest stable release."
25-
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == false)] | .[0].tag_name')
25+
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
2626
else
2727
echo "Getting the latest Nightly release."
28-
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == true)] | .[0].tag_name' || echo "")
29-
if [ -z "${RELEASE}" ]; then
28+
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == true)] | .[0].tag_name' || echo "")
29+
if [ -z "${RELEASE}" ] || [ "${RELEASE}" = "null" ]; then
3030
echo "Nightly release not found, getting the latest stable release."
31-
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[] | select(.prerelease == false)] | .[0].tag_name')
31+
RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
3232
fi
3333
fi
3434
jar_file=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases/tags/${RELEASE} | jq -r '.assets[] | select(.name | endswith(".jar")) | .name' | tail -n 1)

.github/workflows/build-test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ on:
3535
- trunk
3636
paths-ignore:
3737
- '**.md'
38+
- '**/*.md'
39+
- 'CHANGELOG/**'
3840
- '.*'
3941
pull_request:
4042
paths-ignore:
4143
- '**.md'
44+
- '**/*.md'
45+
- 'CHANGELOG/**'
4246

4347
concurrency:
4448
group: ${{ github.workflow }}-${{ github.ref == github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
- name: Create Release
204204
if: env.LATEST_TAG != env.NEXT_TAG
205205
id: create_release
206-
uses: softprops/[email protected].1
206+
uses: softprops/[email protected].2
207207
with:
208208
token: ${{ secrets.GITHUB_TOKEN }}
209209
tag_name: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
command: make chart_release
142142
- name: Create Nightly Release
143143
id: create_release
144-
uses: softprops/[email protected].1
144+
uses: softprops/[email protected].2
145145
with:
146146
token: ${{ secrets.GITHUB_TOKEN }}
147147
tag_name: ${{ env.BASE_RELEASE }}

.github/workflows/release-chrome-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250323'
25+
default: '20250505'
2626
browser-name:
2727
description: 'Browser name to build. E.g: chrome'
2828
required: true
@@ -31,7 +31,7 @@ on:
3131
browser-versions:
3232
description: 'List browser version to build. E.g: [130, 131]'
3333
required: true
34-
default: '[95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134]'
34+
default: '[95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135]'
3535
push-image:
3636
description: 'Push image after testing successfully'
3737
required: true

.github/workflows/release-edge-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250323'
25+
default: '20250505'
2626
browser-name:
2727
description: 'Browser name to build. E.g: edge'
2828
required: true
@@ -31,7 +31,7 @@ on:
3131
browser-versions:
3232
description: 'List browser version to build. E.g: [130, 131]'
3333
required: true
34-
default: '[95, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133]'
34+
default: '[95, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135]'
3535
push-image:
3636
description: 'Push image after testing successfully'
3737
required: true

.github/workflows/release-firefox-versions.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
description: 'Build date in format YYYYMMDD. Must provide if reusing base image'
2323
required: false
2424
type: string
25-
default: '20250323'
25+
default: '20250505'
2626
browser-name:
2727
description: 'Browser name to build. E.g: firefox'
2828
required: true
@@ -31,7 +31,7 @@ on:
3131
browser-versions:
3232
description: 'List browser version to build. E.g: [130, 131]'
3333
required: true
34-
default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136]'
34+
default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137]'
3535
push-image:
3636
description: 'Push image after testing successfully'
3737
required: true
@@ -172,6 +172,7 @@ jobs:
172172
- name: Fetch latest version
173173
run: |
174174
python3 -m pip install -r tests/requirements.txt
175+
python3 tests/build-backward-compatible/fetch_firefox_version.py
175176
python3 tests/build-backward-compatible/fetch_version.py
176177
- name: Download results
177178
uses: actions/download-artifact@v4

.keda/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ The stable implementation will be merged to the upstream KEDA repository frequen
1313
Replace the image registry and tag of these KEDA components with the patched image tag:
1414

1515
```bash
16-
docker pull selenium/keda:2.16.1-selenium-grid-20250323
17-
docker pull selenium/keda-metrics-apiserver:2.16.1-selenium-grid-20250323
18-
docker pull selenium/keda-admission-webhooks:2.16.1-selenium-grid-20250323
16+
docker pull selenium/keda:2.17.0-selenium-grid-20250505
17+
docker pull selenium/keda-metrics-apiserver:2.17.0-selenium-grid-20250505
18+
docker pull selenium/keda-admission-webhooks:2.17.0-selenium-grid-20250505
1919
```
2020

2121
Besides that, you also can use image tag `latest` or `nightly`.
@@ -27,15 +27,15 @@ If you are deploying KEDA core using their official Helm [chart](https://github.
2727
keda:
2828
registry: selenium
2929
repository: keda
30-
tag: "2.16.1-selenium-grid-20250323"
30+
tag: "2.17.0-selenium-grid-20250505"
3131
metricsApiServer:
3232
registry: selenium
3333
repository: keda-metrics-apiserver
34-
tag: "2.16.1-selenium-grid-20250323"
34+
tag: "2.17.0-selenium-grid-20250505"
3535
webhooks:
3636
registry: selenium
3737
repository: keda-admission-webhooks
38-
tag: "2.16.1-selenium-grid-20250323"
38+
tag: "2.17.0-selenium-grid-20250505"
3939
```
4040
4141
If you are deployment Selenium Grid chart with `autoscaling.enabled` is `true` (implies installing KEDA sub-chart), KEDA images registry and tag already set in the `values.yaml`. Refer to list [configuration](../charts/selenium-grid/CONFIGURATION.md).

0 commit comments

Comments
 (0)