From ef69c49622a8b79dda9467f1afb8607ec9605817 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Wed, 4 May 2022 21:07:06 +0200
Subject: [PATCH] [Ubuntu] Add Ruby 3.1 to 22.04 toolcache (#5486)

---
 .../SoftwareReport/SoftwareReport.CachedTools.psm1        | 6 ++----
 images/linux/toolsets/toolset-2204.json                   | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
index c842508ba..66b85a38a 100755
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
@@ -56,10 +56,8 @@ function Build-CachedToolsSection {
     $output += New-MDHeader "Python" -Level 4
     $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
 
-    if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
-        $output += New-MDHeader "Ruby" -Level 4
-        $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered
-    }
+    $output += New-MDHeader "Ruby" -Level 4
+    $output += New-MDList -Lines (Get-ToolcacheRubyVersions) -Style Unordered
 
     return $output
 }
diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json
index 3caeceddd..395f79a68 100644
--- a/images/linux/toolsets/toolset-2204.json
+++ b/images/linux/toolsets/toolset-2204.json
@@ -44,6 +44,14 @@
             ],
             "default": "1.18.*"
         },
+        {
+            "name": "Ruby",
+            "platform_version": "22.04",
+            "arch": "x64",
+            "versions": [
+                "3.1.*"
+            ]
+        },
         {
             "name": "CodeQL",
             "platform" : "linux",