Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MacOS] Add GCC and remove Nomad from MacOS 12 image #4667

Merged
merged 3 commits into from
Dec 7, 2021
Merged

[MacOS] Add GCC and remove Nomad from MacOS 12 image #4667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
091640a
Add gcc 11 to macos12
shilovmaksim Dec 6, 2021
8cd9f92
Remove nomad-shenzhen cli from macos12
shilovmaksim Dec 6, 2021
4248308
Merge remote-tracking branch 'upstream/main' into shilovmaksim/gcc-to…
shilovmaksim Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions images/macos/software-report/SoftwareReport.Generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,11 @@ $languageAndRuntimeList = @(
(Get-JuliaVersion),
(Get-KotlinVersion),
(Get-PHPVersion),
(Get-ClangLLVMVersion)
(Get-ClangLLVMVersion),
(Get-GccVersion),
(Get-FortranVersion)
)

if ($os.IsLessThanMonterey) {
$languageAndRuntimeList += @(
(Get-GccVersion),
(Get-FortranVersion)
)
}

if ($os.IsLessThanBigSur) {
$languageAndRuntimeList += @(
(Get-RVersion)
Expand Down
1 change: 1 addition & 0 deletions images/macos/templates/macOS-12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
"./provision/core/php.sh",
"./provision/core/aws.sh",
"./provision/core/rust.sh",
"./provision/core/gcc.sh",
"./provision/core/haskell.sh",
"./provision/core/stack.sh",
"./provision/core/cocoapods.sh",
Expand Down
2 changes: 1 addition & 1 deletion images/macos/tests/Common.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Describe ".NET" {
}
}

Describe "GCC" -Skip:($os.IsMonterey) {
Describe "GCC" {
$testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} }

It "GCC <Version>" -TestCases $testCases {
Expand Down
2 changes: 1 addition & 1 deletion images/macos/tests/RubyGem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Describe "Bundler" {
}
}

Describe "Nomad shenzhen CLI" {
Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) {
It "Nomad shenzhen CLI" {
"ipa --version" | Should -ReturnZeroExitCode
}
Expand Down
6 changes: 5 additions & 1 deletion images/macos/toolsets/toolset-12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@
"julia"
]
},
"gcc": {
"versions": [
"11"
]
},
"toolcache": [
{
"name": "Python",
Expand Down Expand Up @@ -176,7 +181,6 @@
"rubygems": [
"xcode-install",
"cocoapods",
"nomad-cli",
"xcpretty",
"bundler",
"fastlane",
Expand Down