[macOS] Get rid of unused software in macOS 13 (#9187)

This commit is contained in:
Alexey-Ayupov
2024-01-18 10:41:59 +01:00
committed by GitHub
parent 192a94d178
commit 76ad0eb3d6
6 changed files with 17 additions and 15 deletions

View File

@@ -38,7 +38,9 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion))
$languageAndRuntime.AddNodes($(Get-ClangLLVMVersions)) $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions))
$languageAndRuntime.AddNodes($(Get-GccVersions)) $languageAndRuntime.AddNodes($(Get-GccVersions))
$languageAndRuntime.AddNodes($(Get-FortranVersions)) $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)) $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) { if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion)) $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)) { if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) {
$languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version)) $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)) $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion))
# Package Management # Package Management
@@ -275,9 +279,10 @@ Get-XcodeInfoList | Out-Null
$xcodeInfo = Get-XcodeInfoList $xcodeInfo = Get-XcodeInfoList
$xcode.AddTable($(Build-XcodeTable $xcodeInfo)) $xcode.AddTable($(Build-XcodeTable $xcodeInfo))
if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
$xcodeTools = $xcode.AddHeader("Xcode Support Tools") $xcodeTools = $xcode.AddHeader("Xcode Support Tools")
$xcodeTools.AddNodes($(Build-XcodeSupportToolsSection)) $xcodeTools.AddNodes($(Build-XcodeSupportToolsSection))
}
$installedSdks = $xcode.AddHeader("Installed SDKs") $installedSdks = $xcode.AddHeader("Installed SDKs")
$installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo)) $installedSdks.AddTable($(Build-XcodeSDKTable $xcodeInfo))

View File

@@ -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" { It "Julia" {
"julia --version" | Should -ReturnZeroExitCode "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" { It "R" {
"R --version" | Should -ReturnZeroExitCode "R --version" | Should -ReturnZeroExitCode
} }

View File

@@ -32,7 +32,7 @@ Describe "Fastlane" {
} }
} }
Describe "xcpretty" { Describe "xcpretty" -Skip:($os.IsVentura -or $os.IsSonoma) {
It "xcpretty" { It "xcpretty" {
"xcpretty --version" | Should -ReturnZeroExitCode "xcpretty --version" | Should -ReturnZeroExitCode
} }

View File

@@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
$os = Get-OSVersion $os = Get-OSVersion
Describe "Apache" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64) { Describe "Apache" -Skip:($os.IsVentura -or $os.IsSonoma) {
It "Apache CLI" { It "Apache CLI" {
"httpd -v" | Should -ReturnZeroExitCode "httpd -v" | Should -ReturnZeroExitCode
} }

View File

@@ -217,7 +217,6 @@ build {
"${path.root}/../scripts/build/install-gcc.sh", "${path.root}/../scripts/build/install-gcc.sh",
"${path.root}/../scripts/build/install-cocoapods.sh", "${path.root}/../scripts/build/install-cocoapods.sh",
"${path.root}/../scripts/build/install-android-sdk.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-vcpkg.sh",
"${path.root}/../scripts/build/install-safari.sh", "${path.root}/../scripts/build/install-safari.sh",
"${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-chrome.sh",

View File

@@ -1,6 +1,6 @@
{ {
"xcode": { "xcode": {
"default": "14.3.1", "default": "15.0.1",
"x64": { "x64": {
"versions": [ "versions": [
{ "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"}, { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},
@@ -77,14 +77,13 @@
"swiftformat", "swiftformat",
"zstd", "zstd",
"gmp", "gmp",
"r",
"yq", "yq",
"unxip", "unxip",
"xcbeautify", "xcbeautify",
"xcodes" "xcodes"
], ],
"cask_packages": [ "cask_packages": [
"julia" ""
] ]
}, },
"gcc": { "gcc": {
@@ -114,7 +113,6 @@
"default": "3.0", "default": "3.0",
"rubygems": [ "rubygems": [
"cocoapods", "cocoapods",
"xcpretty",
"bundler", "bundler",
"fastlane" "fastlane"
] ]
@@ -217,7 +215,7 @@
"default": "1.20" "default": "1.20"
}, },
"node": { "node": {
"default": "18" "default": "20"
}, },
"llvm": { "llvm": {
"version": "15" "version": "15"