Fixes failure on macOS CI (#1304)

alibaba · Jan 29, 2022 · 97d12bf · 97d12bf
1 parent 10f2580
commit 97d12bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -26,6 +26,10 @@ jobs:
 
     - name: Install Dependencies
       run: |
+        pushd $(brew --repo homebrew/core)
+        # fixed protobuf version 3.17.3
+        git checkout 2b411d925849478163647594b32fd237828cf720
+        popd
         ${GITHUB_WORKSPACE}/scripts/install_deps.sh --dev --vineyard_prefix /opt/vineyard --verbose
 
     - name: Build Server Wheel
@@ -68,6 +72,10 @@ jobs:
 
     - name: Install Dependencies
       run: |
+        pushd $(brew --repo homebrew/core)
+        # fixed protobuf version 3.17.3
+        git checkout 2b411d925849478163647594b32fd237828cf720
+        popd
         ${GITHUB_WORKSPACE}/scripts/install_deps.sh --dev --verbose
 
     - name: Build Client Wheels

diff --git a/coordinator/gscoordinator/utils.py b/coordinator/gscoordinator/utils.py
@@ -1776,5 +1776,5 @@ def _check_task(endpoint):
             return rlt
         time.sleep(3)
         if time.time() - begin_time > INTERAVTIVE_INSTANCE_TIMEOUT_SECONDS:
-            executor.shutdown(wait=False, cancel_futures=True)
+            executor.shutdown(wait=False)
             raise TimeoutError(f"Gremlin check query failed: {error_message}")