update

alibaba · Sep 26, 2024 · 09c0b4f · 09c0b4f
1 parent a8d0975
commit 09c0b4f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -1,24 +1,32 @@
 name: Build GraphScope Wheels on macOS
 
 # on: [push, pull_request]
+#on:
+  #workflow_dispatch:
+  #schedule:
+    ## The notifications for scheduled workflows are sent to the user who
+    ## last modified the cron syntax in the workflow file.
+    ## Trigger the workflow at 03:00(CST) every day.
+    #- cron:  '00 19 * * *'
+  #push:
+    #tags:
+      #- "v*"
+
 on:
-  workflow_dispatch:
-  schedule:
-    # The notifications for scheduled workflows are sent to the user who
-    # last modified the cron syntax in the workflow file.
-    # Trigger the workflow at 03:00(CST) every day.
-    - cron:  '00 19 * * *'
   push:
-    tags:
-      - "v*"
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 concurrency:
   group: ${{ github.repository }}-${{ github.event.number || github.head_ref || github.sha }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
   build-wheels:
-    if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
+    # if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
     runs-on: macos-12
     strategy:
       matrix:
@@ -142,7 +150,7 @@ jobs:
         retention-days: 5
 
   build-client-wheels:
-    if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
+    # if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
     runs-on: macos-12
     strategy:
       matrix:

diff --git a/python/graphscope/gsctl/scripts/install_deps.sh b/python/graphscope/gsctl/scripts/install_deps.sh
@@ -819,12 +819,17 @@ install_analytical_java_dependencies() {
   # llvm
   if [[ "${OS_PLATFORM}" == *"Darwin"* ]]; then
     brew install llvm || true # prevent the `brew link` failure
+    export CC=${homebrew_prefix}/opt/llvm/bin/clang
+    export CXX=${homebrew_prefix}/opt/llvm/bin/clang++
+    export CPPFLAGS="${CPPFLAGS} -I${homebrew_prefix}/opt/llvm/include"
+    export CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER=${CC}
   elif [[ "${OS_PLATFORM}" == *"Ubuntu"* ]]; then
     ${SUDO} apt-get install -y llvm-11-dev lld-11 clang-11
   else
     if [[ "${OS_VERSION}" -eq "7" ]]; then
       ${SUDO} yum install -y llvm-toolset-7.0-clang-devel
       source /opt/rh/llvm-toolset-7.0/enable
+      export LIBCLANG_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64/
     else
       ${SUDO} yum install -y llvm-devel clang-devel lld
     fi