From 89e19af4c9b514a4f41a30c40464ed31d2ec28b7 Mon Sep 17 00:00:00 2001
From: Maksim Shilov <89912354+shilovmaksim@users.noreply.github.com>
Date: Wed, 8 Dec 2021 00:35:25 +0300
Subject: [PATCH] [MacOS] Add GCC and remove Nomad from MacOS 12 image (#4667)

* Add gcc 11 to macos12

* Remove nomad-shenzhen cli from macos12
---
 .../software-report/SoftwareReport.Generator.ps1      | 11 +++--------
 images/macos/templates/macOS-12.json                  |  1 +
 images/macos/tests/Common.Tests.ps1                   |  2 +-
 images/macos/tests/RubyGem.Tests.ps1                  |  2 +-
 images/macos/toolsets/toolset-12.json                 |  6 +++++-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 5490a66d..43442cef 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -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)
diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json
index 6cf0215d..2d3c1768 100644
--- a/images/macos/templates/macOS-12.json
+++ b/images/macos/templates/macOS-12.json
@@ -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",
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 107937da..19f338a2 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -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 {
diff --git a/images/macos/tests/RubyGem.Tests.ps1 b/images/macos/tests/RubyGem.Tests.ps1
index cd380688..5e15d2f7 100644
--- a/images/macos/tests/RubyGem.Tests.ps1
+++ b/images/macos/tests/RubyGem.Tests.ps1
@@ -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
     }
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 0f35a318..117a023e 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -104,6 +104,11 @@
             "julia"
         ]
     },
+    "gcc": {
+        "versions": [
+            "11"
+        ]
+    },
     "toolcache": [
         {
             "name": "Python",
@@ -176,7 +181,6 @@
         "rubygems": [
             "xcode-install",
             "cocoapods",
-            "nomad-cli",
             "xcpretty",
             "bundler",
             "fastlane",