From 76ad0eb3d6cb154ae82e60f6ec46c193f8749c12 Mon Sep 17 00:00:00 2001 From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com> Date: Thu, 18 Jan 2024 10:41:59 +0100 Subject: [PATCH] [macOS] Get rid of unused software in macOS 13 (#9187) --- .../scripts/docs-gen/Generate-SoftwareReport.ps1 | 15 ++++++++++----- images/macos/scripts/tests/BasicTools.Tests.ps1 | 4 ++-- images/macos/scripts/tests/RubyGem.Tests.ps1 | 2 +- images/macos/scripts/tests/WebServers.Tests.ps1 | 2 +- images/macos/templates/macOS-13.anka.pkr.hcl | 1 - images/macos/toolsets/toolset-13.json | 8 +++----- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 index 2419f45ba..01d07b2bd 100644 --- a/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -38,7 +38,9 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-FortranVersions)) -$languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion)) +} $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion)) if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) @@ -62,7 +64,9 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) { $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) } -$languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $languageAndRuntime.AddToolVersion("R", $(Get-RVersion)) +} $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion)) # Package Management @@ -275,9 +279,10 @@ Get-XcodeInfoList | Out-Null $xcodeInfo = Get-XcodeInfoList $xcode.AddTable($(Build-XcodeTable $xcodeInfo)) - -$xcodeTools = $xcode.AddHeader("Xcode Support Tools") -$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) +if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { + $xcodeTools = $xcode.AddHeader("Xcode Support Tools") + $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) +} $installedSdks = $xcode.AddHeader("Installed SDKs") $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) diff --git a/images/macos/scripts/tests/BasicTools.Tests.ps1 b/images/macos/scripts/tests/BasicTools.Tests.ps1 index 9e65f7845..a570f9988 100644 --- a/images/macos/scripts/tests/BasicTools.Tests.ps1 +++ b/images/macos/scripts/tests/BasicTools.Tests.ps1 @@ -123,7 +123,7 @@ Describe "Aliyun CLI" -Skip:($os.IsMonterey -or $os.IsVentura -or $os.IsSonoma) } } -Describe "Julia" { +Describe "Julia" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Julia" { "julia --version" | Should -ReturnZeroExitCode } @@ -159,7 +159,7 @@ Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) { } } -Describe "R" { +Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) { It "R" { "R --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/RubyGem.Tests.ps1 b/images/macos/scripts/tests/RubyGem.Tests.ps1 index f5ef6f155..2dc611e59 100644 --- a/images/macos/scripts/tests/RubyGem.Tests.ps1 +++ b/images/macos/scripts/tests/RubyGem.Tests.ps1 @@ -32,7 +32,7 @@ Describe "Fastlane" { } } -Describe "xcpretty" { +Describe "xcpretty" -Skip:($os.IsVentura -or $os.IsSonoma) { It "xcpretty" { "xcpretty --version" | Should -ReturnZeroExitCode } diff --git a/images/macos/scripts/tests/WebServers.Tests.ps1 b/images/macos/scripts/tests/WebServers.Tests.ps1 index f1365b2ad..a132ba06f 100644 --- a/images/macos/scripts/tests/WebServers.Tests.ps1 +++ b/images/macos/scripts/tests/WebServers.Tests.ps1 @@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" $os = Get-OSVersion -Describe "Apache" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { +Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) { It "Apache CLI" { "httpd -v" | Should -ReturnZeroExitCode } diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl index 6eb430615..ee3b447ef 100644 --- a/images/macos/templates/macOS-13.anka.pkr.hcl +++ b/images/macos/templates/macOS-13.anka.pkr.hcl @@ -217,7 +217,6 @@ build { "${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-android-sdk.sh", - "${path.root}/../scripts/build/install-apache.sh", "${path.root}/../scripts/build/install-vcpkg.sh", "${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-chrome.sh", diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json index ca32d92d2..0ae144262 100644 --- a/images/macos/toolsets/toolset-13.json +++ b/images/macos/toolsets/toolset-13.json @@ -1,6 +1,6 @@ { "xcode": { - "default": "14.3.1", + "default": "15.0.1", "x64": { "versions": [ { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, @@ -77,14 +77,13 @@ "swiftformat", "zstd", "gmp", - "r", "yq", "unxip", "xcbeautify", "xcodes" ], "cask_packages": [ - "julia" + "" ] }, "gcc": { @@ -114,7 +113,6 @@ "default": "3.0", "rubygems": [ "cocoapods", - "xcpretty", "bundler", "fastlane" ] @@ -217,7 +215,7 @@ "default": "1.20" }, "node": { - "default": "18" + "default": "20" }, "llvm": { "version": "15"