[chore](macOS) Specify the version of LLVM for Homebrew to install it (…

…apache#17945) Clang 16 was released last week and we haven't ported the codebase to it. If Homebrew bumped the version of LLVM, our workflows would fail.
adonis0147 · Apr 24, 2023 · 9eddb53 · 9eddb53
1 parent 12d6bc3
commit 9eddb53
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/be-ut-mac.yml b/.github/workflows/be-ut-mac.yml
@@ -67,7 +67,7 @@ jobs:
             'texinfo'
             'coreutils'
             'gnu-getopt'
-            'python'
+            'python@3'
             'cmake'
             'ninja'
             'ccache'
@@ -79,7 +79,7 @@ jobs:
             'openjdk@11'
             'maven'
             'node'
-            'llvm'
+            'llvm@15'
           )
           brew install "${cellars[@]}"
 

diff --git a/.github/workflows/build-thirdparty.yml b/.github/workflows/build-thirdparty.yml
@@ -89,7 +89,6 @@ jobs:
             'openjdk-11-jdk'
             'openjdk-11-jdk-headless'
             'maven'
-            'llvm'
           )
 
           sudo apt update
@@ -135,7 +134,7 @@ jobs:
             'texinfo'
             'coreutils'
             'gnu-getopt'
-            'python'
+            'python@3'
             'cmake'
             'ninja'
             'ccache'
@@ -147,6 +146,7 @@ jobs:
             'openjdk@11'
             'maven'
             'node'
+            'llvm@15'
           )
 
           brew install "${packages[@]}"

diff --git a/docs/en/docs/install/source-install/compilation-mac.md b/docs/en/docs/install/source-install/compilation-mac.md
@@ -38,7 +38,7 @@ This post introduces how to compile from source on macOS (both x86_64 and arm64)
 1. Use [Homebrew](https://brew.sh/) to install tools
     ```shell
     brew install automake autoconf libtool pkg-config texinfo coreutils gnu-getopt \
-        python cmake ninja ccache bison byacc gettext wget pcre maven llvm openjdk@11 npm
+        python@3 cmake ninja ccache bison byacc gettext wget pcre maven llvm@15 openjdk@11 npm
     ```
 
 2. Compile from source

diff --git a/docs/zh-CN/docs/install/source-install/compilation-mac.md b/docs/zh-CN/docs/install/source-install/compilation-mac.md
@@ -38,7 +38,7 @@ under the License.
 1. 使用[Homebrew](https://brew.sh/)安装依赖
     ```shell
     brew install automake autoconf libtool pkg-config texinfo coreutils gnu-getopt \
-        python cmake ninja ccache bison byacc gettext wget pcre maven llvm openjdk@11 npm
+        python@3 cmake ninja ccache bison byacc gettext wget pcre maven llvm@15 openjdk@11 npm
     ```
 
 2. 编译源码

diff --git a/env.sh b/env.sh
@@ -51,7 +51,7 @@ CELLARS=(
     texinfo
     coreutils
     gnu-getopt
-    python
+    python@3
     cmake
     ninja
     ccache
@@ -61,7 +61,7 @@ CELLARS=(
     wget
     pcre
     maven
-    llvm
+    llvm@15
 )
 for cellar in "\${CELLARS[@]}"; do
     EXPORT_CELLARS="\${HOMEBREW_REPO_PREFIX}/opt/\${cellar}/bin:\${EXPORT_CELLARS}"