From d12bc7894b36aba457583b94a658f42bd3d69a44 Mon Sep 17 00:00:00 2001 From: vidyasagarnimmagaddi <160703874+vidyasagarnimmagaddi@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:38:29 +0530 Subject: [PATCH] [Ubuntu] adding ruby version 3.3.* (#11452) Co-authored-by: Pat Myron --- images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 | 5 ++--- images/ubuntu/toolsets/toolset-2004.json | 3 ++- images/ubuntu/toolsets/toolset-2204.json | 3 ++- images/ubuntu/toolsets/toolset-2404.json | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 index 1174e7b62..962262335 100644 --- a/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -251,9 +251,8 @@ $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+") $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+") $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+") -if (-not $(Test-IsUbuntu24)) { - $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") -} +$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+") + # PowerShell Tools $powerShellTools = $installedSoftware.AddHeader("PowerShell Tools") diff --git a/images/ubuntu/toolsets/toolset-2004.json b/images/ubuntu/toolsets/toolset-2004.json index b3662e70a..1f872bd89 100644 --- a/images/ubuntu/toolsets/toolset-2004.json +++ b/images/ubuntu/toolsets/toolset-2004.json @@ -58,7 +58,8 @@ "versions": [ "3.0.*", "3.1.*", - "3.2.*" + "3.2.*", + "3.3.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index 4e6e4deab..ea12307a7 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -55,7 +55,8 @@ "arch": "x64", "versions": [ "3.1.*", - "3.2.*" + "3.2.*", + "3.3.*" ] }, { diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 41de91cfe..856cb5eab 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -51,7 +51,8 @@ "platform_version": "24.04", "arch": "x64", "versions": [ - "3.2.*" + "3.2.*", + "3.3.*" ] }, {