From 97d12bf5383d3f4fb3b58557b516300781c534bf Mon Sep 17 00:00:00 2001 From: DongZe Li <9546726@qq.com> Date: Sat, 29 Jan 2022 10:19:01 +0800 Subject: [PATCH] Fixes failure on macOS CI (#1304) --- .github/workflows/build-graphscope-wheels-macos.yml | 8 ++++++++ coordinator/gscoordinator/utils.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml index a8442e8075a7..e455e53fddcb 100644 --- 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 index 052bb471722c..b6055ebc51a7 100644 --- 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}")