Merge branch 'trunk' into renovate/postgresql-16.x

Author: VietND96

.ffmpeg/Dockerfile

@@ -3,6 +3,7 @@ ARG VERSION_FFMPEG="7.1"
 ARG VERSION_RCLONE="v1.68.2"
 ARG VERSION_GO="latest"
 ARG GO_CRYPTO_VERSION="v0.31.0"
+ARG GO_NET_VERSION="v0.33.0"
 
 USER root
 
@@ -33,6 +34,7 @@ RUN cd /usr/local/src \
     && git checkout $VERSION_RCLONE \
     # Patch deps version in go.mod to fix CVEs
     && sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
+    && sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
     && go mod tidy \
     # Build rclone
     && make \

.github/workflows/build-ffmpeg.yml

@@ -2,6 +2,8 @@ name: Build and Deploy FFmpeg
 
 on:
   push:
+    branches:
+      - trunk
     paths:
       - '.ffmpeg/Dockerfile'
   pull_request:

.github/workflows/build-test.yml

@@ -16,12 +16,19 @@ on:
         type: boolean
         default: true
   push:
+    branches:
+      - trunk
     paths-ignore:
       - '**.md'
+      - '.*'
   pull_request:
     paths-ignore:
       - '**.md'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions: write-all
 
 env:
@@ -33,14 +40,17 @@ env:
 
 jobs:
   docker-test:
+    if: contains(toJson(github.event.commits), '[skip test]') == false
     name: Test Seleium Grid on Docker
     uses: ./.github/workflows/docker-test.yml
     with:
       release: ${{ inputs.release == 'true' }}
 
   helm-chart-test:
+    if: contains(toJson(github.event.commits), '[skip test]') == false
     name: Test Selenium Grid on Kubernetes
     uses: ./.github/workflows/helm-chart-test.yml
+    secrets: inherit
     with:
       release: ${{ inputs.release == 'true' }}
 

.github/workflows/deploy.yml

@@ -43,7 +43,7 @@ jobs:
   deploy:
     needs:
       - build-test
-    if: (contains(toJson(github.event.commits), '[deploy]') || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
+    if: (contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
     name: Deploy and Release
     runs-on: blacksmith-8vcpu-ubuntu-2204
     permissions: write-all
@@ -174,7 +174,7 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-          git commit -m "Update tag ${RELEASE_TAG} in docs and files" -a
+          git commit -m "[ci] Update tag ${RELEASE_TAG} in docs and files" -m "[skip test]" -a
         env:
           RELEASE_TAG: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"
       - name: Push changes

.github/workflows/helm-chart-release.yml

@@ -33,7 +33,7 @@ env:
 
 jobs:
   helm-chart-test:
-    if: github.event.inputs.skip-test != 'true'
+    if: github.event.inputs.skip-test != 'true' && contains(toJson(github.event.commits), '[skip test]') == false
     uses: ./.github/workflows/helm-chart-test.yml
     with:
       release: ${{ github.event.inputs.release == 'true' }}
@@ -114,7 +114,7 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-          git commit -m "Update chart ${LATEST_CHART_VERSION} changelog [skip ci]" -a || true
+          git commit -m "[ci] Update chart ${LATEST_CHART_VERSION} changelog" -m "[skip ci]" -a || true
 
       - name: Push changes
         if: github.event.inputs.skip-commit != 'true'

.github/workflows/helm-chart-test.yml

@@ -2,6 +2,11 @@ name: Test Helm Charts
 
 on:
   workflow_call:
+    secrets:
+      DOCKER_USERNAME:
+        required: false
+      DOCKER_PASSWORD:
+        required: false
     inputs:
       release:
         description: 'Test a new release process'
@@ -142,7 +147,6 @@ jobs:
       - name: Sets build date
         run: |
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
-          echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
@@ -158,6 +162,11 @@ jobs:
           max_attempts: 3
           retry_wait_seconds: 60
           command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
+      - name: Login Docker Hub
+        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       - name: Setup Kubernetes cluster
         uses: nick-invision/retry@master
         with:

.github/workflows/k8s-scaling-test.yml

@@ -2,6 +2,11 @@ name: Test Grid Autoscaling in Kubernetes
 
 on:
   workflow_call:
+    secrets:
+      DOCKER_USERNAME:
+        required: false
+      DOCKER_PASSWORD:
+        required: false
     inputs:
       release:
         description: 'Test a new release process'
@@ -36,6 +41,10 @@ on:
         type: string
         default: '20'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
   pull-requests: write
@@ -135,10 +144,14 @@ jobs:
       - name: Sets build date
         run: |
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
-          echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
+      - name: Login Docker Hub
+        run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+        env:
+          DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
       - name: Setup Kubernetes cluster
         uses: nick-invision/retry@master
         with:
@@ -205,7 +218,7 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
           git add .keda/.
-          git commit -m "[ci] Upload autoscaling in K8s test results [skip ci]" -a
+          git commit -m "[ci] Upload autoscaling in K8s test results" -m "[skip ci]" -a
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:

.github/workflows/lock.yml

@@ -4,7 +4,7 @@ name: 'Lock Issues'
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 23 * * *'
 
 permissions:
   issues: write

.github/workflows/update-chart-readme.yml

@@ -43,7 +43,7 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-          git commit -m "Update chart configuration table" -a
+          git commit -m "[ci] Update chart configuration table" -m "[skip test]" -a
       - name: Push changes
         if: env.diff == 'true'
         uses: ad-m/github-push-action@master

.keda/README.md

@@ -49,12 +49,16 @@ You can involve to review and discuss the pull requests to help us early detect
 
 [kedacore/keda](https://github.com/kedacore/keda)
 
-- https://github.com/kedacore/keda/pull/6368
+- ~~https://github.com/kedacore/keda/pull/6437 (merged, v2.16.1)~~
+
+- ~~https://github.com/kedacore/keda/pull/6368 (merged, v2.16.1)~~
 
 - ~~https://github.com/kedacore/keda/pull/6169 (merged, v2.16.0)~~
 
 [kedacore/keda-docs](https://github.com/kedacore/keda-docs)
 
+- https://github.com/kedacore/keda-docs/pull/1515
+
 - ~~https://github.com/kedacore/keda-docs/pull/1468 (merged, v2.16.0)~~
 
 # Test results of the patch scaler