[macOS] move llvm to toolset (#4457)

images/macos/provision/core/commonutils.sh

@@ -2,8 +2,8 @@
 source ~/utils/utils.sh
 
 # Monterey needs future review:
-# Llvm, aliyun-cli, gnupg, helm have issues with building from the source code.
-# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code. 
+# aliyun-cli, gnupg, helm have issues with building from the source code.
+# Added gmp for now, because toolcache ruby needs its libs. Remove it when php starts to build from source code.
 common_packages=$(get_toolset_value '.brew.common_packages[]')
 for package in $common_packages; do
     echo "Installing $package..."

images/macos/provision/core/llvm.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -e -o pipefail
+source ~/utils/utils.sh
+
+llvmVersion=$(get_toolset_value '.llvm.version')
+
+brew_smart_install "llvm@${llvmVersion}"
+
+invoke_tests "LLVM"

images/macos/templates/macOS-10.15.json

@@ -160,6 +160,7 @@
             "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
             "scripts": [
                 "./provision/core/commonutils.sh",
+                "./provision/core/llvm.sh",
                 "./provision/core/golang.sh",
                 "./provision/core/swiftlint.sh",
                 "./provision/core/openjdk.sh",

images/macos/templates/macOS-11.json

@@ -165,6 +165,7 @@
             "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
             "scripts": [
                 "./provision/core/commonutils.sh",
+                "./provision/core/llvm.sh",
                 "./provision/core/golang.sh",
                 "./provision/core/swiftlint.sh",
                 "./provision/core/openjdk.sh",
@@ -198,7 +199,7 @@
         {
             "type": "shell",
             "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
-            "scripts": [ 
+            "scripts": [
                 "./provision/core/toolset.ps1",
                 "./provision/core/configure-toolset.ps1"
             ]

images/macos/templates/macOS-11.pkr.hcl

@@ -163,6 +163,7 @@ build {
   provisioner "shell" {
     scripts = [
                 "./provision/core/commonutils.sh",
+                "./provision/core/llvm.sh",
                 "./provision/core/golang.sh",
                 "./provision/core/swiftlint.sh",
                 "./provision/core/openjdk.sh",

images/macos/tests/BasicTools.Tests.ps1

@@ -30,19 +30,12 @@ Describe "SwiftFormat" -Skip:($os.IsMonterey) {
     }
 }
 
-
 Describe "GnuPG" -Skip:($os.IsMonterey) {
     It "GnuPG" {
         "gpg --version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "Clang/LLVM" -Skip:($os.IsMonterey) {
-    It "Clang/LLVM is installed" {
-        "$(brew --prefix llvm)/bin/clang --version" | Should -ReturnZeroExitCode
-    }
-}
-
 Describe "zstd" {
     It "zstd" {
         "zstd --version" | Should -ReturnZeroExitCode

images/macos/tests/LLVM.Tests.ps1

@@ -0,0 +1,9 @@
+$os = Get-OSVersion
+
+Describe "Clang/LLVM" -Skip:($os.IsMonterey) {
+    It "Clang/LLVM is installed and version is correct" {
+        $toolsetVersion = Get-ToolsetValue 'llvm.version'
+        $clangVersion = & "$(brew --prefix llvm)/bin/clang" --version
+        $clangVersion[0] | Should -BeLike "*${toolsetVersion}*"
+    }
+}

images/macos/toolsets/toolset-10.15.json

@@ -215,7 +215,6 @@
             "helm",
             "kotlin",
             "libpq",
-            "llvm",
             "p7zip",
             "packer",
             "parallel",
@@ -339,5 +338,8 @@
             "12",
             "14"
         ]
+    },
+    "llvm": {
+        "version": "13"
     }
 }

images/macos/toolsets/toolset-11.json

@@ -176,7 +176,6 @@
             "helm",
             "kotlin",
             "libpq",
-            "llvm",
             "p7zip",
             "packer",
             "perl",
@@ -291,5 +290,8 @@
             "12",
             "14"
         ]
+    },
+    "llvm": {
+        "version": "13"
     }
 }