[macos] add architecture references (#7593)

This commit is contained in:
Shamil Mubarakshin
2023-05-16 16:39:03 +02:00
committed by GitHub
parent cc2b556e65
commit 111d6ae5cf
4 changed files with 43 additions and 29 deletions

View File

@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion $os = Get-OSVersion
Describe "Ruby" -Skip:($os.IsVentura) { Describe "Ruby" -Skip:($os.IsVentura -or $os.IsBigSur -or $os.IsMonterey) {
It "Ruby is available" { It "Ruby is available" {
"ruby --version" | Should -ReturnZeroExitCode "ruby --version" | Should -ReturnZeroExitCode
} }

View File

@@ -2,7 +2,9 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1" Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
$xcodeVersions = Get-ToolsetValue "xcode.versions" $ARCH = arch
if ($ARCH -ne "arm64") { $ARCH = "x64" }
$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
$defaultXcode = Get-ToolsetValue "xcode.default" $defaultXcode = Get-ToolsetValue "xcode.default"
$latestXcodeVersion = $xcodeVersions | Select-Object -First 1 $latestXcodeVersion = $xcodeVersions | Select-Object -First 1
$os = Get-OSVersion $os = Get-OSVersion

View File

@@ -1,14 +1,16 @@
{ {
"xcode": { "xcode": {
"default": "13.2.1", "default": "13.2.1",
"versions": [ "x64": {
{ "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, "versions": [
{ "link": "13.1", "version": "13.1.0" }, { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
{ "link": "13.0", "version": "13.0.0" }, { "link": "13.1", "version": "13.1.0" },
{ "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] }, { "link": "13.0", "version": "13.0.0" },
{ "link": "12.4", "version": "12.4.0" }, { "link": "12.5.1", "version": "12.5.1", "symlinks": ["12.5"] },
{ "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] } { "link": "12.4", "version": "12.4.0" },
] { "link": "11.7", "version": "11.7.0", "symlinks": ["11.7_beta"] }
]
}
}, },
"xamarin": { "xamarin": {
"vsmac": { "vsmac": {
@@ -307,11 +309,15 @@
} }
], ],
"dotnet": { "dotnet": {
"versions": [ "arch":{
"3.1", "x64": {
"6.0", "versions": [
"7.0" "3.1",
] "6.0",
"7.0"
]
}
}
}, },
"ruby": { "ruby": {
"default": "2.7", "default": "2.7",

View File

@@ -1,15 +1,17 @@
{ {
"xcode": { "xcode": {
"default": "14.2", "default": "14.2",
"versions": [ "x64": {
{ "link": "14.2", "version": "14.2.0" }, "versions": [
{ "link": "14.1", "version": "14.1.0" }, { "link": "14.2", "version": "14.2.0" },
{ "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] }, { "link": "14.1", "version": "14.1.0" },
{ "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] }, { "link": "14.0.1", "version": "14.0.1", "symlinks": ["14.0"] },
{ "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] }, { "link": "13.4.1", "version": "13.4.1", "symlinks": ["13.4"] },
{ "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] }, { "link": "13.3.1", "version": "13.3.1", "symlinks": ["13.3"] },
{ "link": "13.1", "version": "13.1.0" } { "link": "13.2.1", "version": "13.2.1", "symlinks": ["13.2"] },
] { "link": "13.1", "version": "13.1.0" }
]
}
}, },
"xamarin": { "xamarin": {
"vsmac": { "vsmac": {
@@ -290,11 +292,15 @@
} }
], ],
"dotnet": { "dotnet": {
"versions": [ "arch":{
"3.1", "x64": {
"6.0", "versions": [
"7.0" "3.1",
] "6.0",
"7.0"
]
}
}
}, },
"ruby": { "ruby": {
"default": "3.0", "default": "3.0",