Merge branch '2.18' into 2.19

Author: cowtowncoder

.github/workflows/main.yml

@@ -1,23 +1,18 @@
 name: Build and Deploy Snapshot
 on:
   push:
-    branches:
-    - 3.x
-    - "2.19"
+    branches: [2.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
-    branches:
-    - master
-    - 3.x
-    - "2.19"
+    branches: [2.*]
     paths-ignore:
     - "README.md"
     - "release-notes/*"
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    runs-on: 'ubuntu-24.04'
     strategy:
       fail-fast: false
       matrix: