Merge branch '2.18' into 2.19

Author: cowtowncoder

.github/workflows/main.yml

@@ -2,15 +2,11 @@ name: Build and Deploy Snapshot
 on:
   push:
     branches:
-    - 3.x
-    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
-    - 3.x
-    - "2.19"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -19,7 +15,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    runs-on: 'ubuntu-24.04'
     strategy:
       fail-fast: false
       matrix: