From eca1f30b3e069765170cc6325568fa6bea20fc58 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Tue, 20 Jan 2026 14:33:53 +0100
Subject: [PATCH] [all OSs] Add Ruby 4.0 to the toolcache (#13550)

---
 images/macos/toolsets/toolset-14.json     | 6 ++++--
 images/macos/toolsets/toolset-15.json     | 6 ++++--
 images/macos/toolsets/toolset-26.json     | 3 ++-
 images/ubuntu/toolsets/toolset-2204.json  | 3 ++-
 images/ubuntu/toolsets/toolset-2404.json  | 3 ++-
 images/windows/toolsets/toolset-2022.json | 3 ++-
 images/windows/toolsets/toolset-2025.json | 3 ++-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json
index 09dd84c10..c27b570a2 100644
--- a/images/macos/toolsets/toolset-14.json
+++ b/images/macos/toolsets/toolset-14.json
@@ -302,14 +302,16 @@
                     "versions": [
                         "3.2.*",
                         "3.3.*",
-                        "3.4.*"
+                        "3.4.*",
+                        "4.0.*"
                     ]
                 },
                 "arm64": {
                     "versions": [
                         "3.2.*",
                         "3.3.*",
-                        "3.4.*"
+                        "3.4.*",
+                        "4.0.*"
                     ]
                 }
             }
diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json
index 466d96333..39bfc1a92 100644
--- a/images/macos/toolsets/toolset-15.json
+++ b/images/macos/toolsets/toolset-15.json
@@ -320,14 +320,16 @@
                     "versions": [
                         "3.2.*",
                         "3.3.*",
-                        "3.4.*"
+                        "3.4.*",
+                        "4.0.*"
                     ]
                 },
                 "arm64": {
                     "versions": [
                         "3.2.*",
                         "3.3.*",
-                        "3.4.*"
+                        "3.4.*",
+                        "4.0.*"
                     ]
                 }
             }
diff --git a/images/macos/toolsets/toolset-26.json b/images/macos/toolsets/toolset-26.json
index f033413ab..bc8a7de59 100644
--- a/images/macos/toolsets/toolset-26.json
+++ b/images/macos/toolsets/toolset-26.json
@@ -179,7 +179,8 @@
                     "versions": [
                         "3.2.*",
                         "3.3.*",
-                        "3.4.*"
+                        "3.4.*",
+                        "4.0.*"
                     ]
                 }
             }
diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json
index a3e5c96e1..828454e10 100644
--- a/images/ubuntu/toolsets/toolset-2204.json
+++ b/images/ubuntu/toolsets/toolset-2204.json
@@ -57,7 +57,8 @@
             "versions": [
                 "3.2.*",
                 "3.3.*",
-                "3.4.*"
+                "3.4.*",
+                "4.0.*"
             ]
         },
         {
diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json
index 52cdcfcf4..b6b8170c0 100644
--- a/images/ubuntu/toolsets/toolset-2404.json
+++ b/images/ubuntu/toolsets/toolset-2404.json
@@ -55,7 +55,8 @@
             "versions": [
                 "3.2.*",
                 "3.3.*",
-                "3.4.*"
+                "3.4.*",
+                "4.0.*"
             ]
         },
         {
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index 451e64252..0dd5d5751 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -7,7 +7,8 @@
             "versions": [
                 "3.2",
                 "3.3",
-                "3.4"
+                "3.4",
+                "4.0"
             ],
             "default": "3.3"
         },
diff --git a/images/windows/toolsets/toolset-2025.json b/images/windows/toolsets/toolset-2025.json
index c81d68b92..7be1d5b17 100644
--- a/images/windows/toolsets/toolset-2025.json
+++ b/images/windows/toolsets/toolset-2025.json
@@ -7,7 +7,8 @@
             "versions": [
                 "3.2",
                 "3.3",
-                "3.4"
+                "3.4",
+                "4.0"
             ],
             "default": "3.3"
         },