Merge branch '2.x' into 3.x

Author: cowtowncoder

.github/workflows/main.yml

@@ -1,14 +1,12 @@
 name: Build and Deploy Snapshot
 on:
   push:
-    branches:
-    - 3.x
+    branches: [3.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
-    branches:
-    - 3.x
+    branches: [3.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -17,7 +15,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: 'ubuntu-24.04'
+    runs-on: 'ubuntu-latest'
     strategy:
       fail-fast: false
       matrix: