From 3a92d5a1971745f1fe710220a80f36d20da5a056 Mon Sep 17 00:00:00 2001 From: dl239 Date: Mon, 18 Sep 2023 10:41:56 +0800 Subject: [PATCH 1/2] fix: python mac --- steps/test_python.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/steps/test_python.sh b/steps/test_python.sh index 8c366f77b0c..7560524c867 100644 --- a/steps/test_python.sh +++ b/steps/test_python.sh @@ -18,8 +18,6 @@ set -ex ROOT_DIR=$(pwd) -bash onebox/stop_all.sh - # on hybridsql 0.4.1 or later, 'THIRD_PARTY_SRC_DIR' is defined and is '/deps/src' THIRDSRC=${THIRD_PARTY_SRC_DIR:-thirdsrc} From a629948433f764a5af9380ad1bcd2e5c135d03f5 Mon Sep 17 00:00:00 2001 From: dl239 Date: Mon, 9 Oct 2023 09:42:25 +0800 Subject: [PATCH 2/2] fix: fix comment --- onebox/stop_all.sh | 2 +- steps/test_python.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/onebox/stop_all.sh b/onebox/stop_all.sh index 747adcdf929..7ba340228f3 100755 --- a/onebox/stop_all.sh +++ b/onebox/stop_all.sh @@ -17,7 +17,7 @@ set -x -e if [[ "$OSTYPE" = "darwin"* ]]; then - pkill -9 -x -l openmldb + pkill -9 -x -l openmldb || exit 0 else pgrep -a -f "openmldb.*onebox.*" | awk '{print $1}' | xargs -I {} kill -9 {} fi diff --git a/steps/test_python.sh b/steps/test_python.sh index 7560524c867..8c366f77b0c 100644 --- a/steps/test_python.sh +++ b/steps/test_python.sh @@ -18,6 +18,8 @@ set -ex ROOT_DIR=$(pwd) +bash onebox/stop_all.sh + # on hybridsql 0.4.1 or later, 'THIRD_PARTY_SRC_DIR' is defined and is '/deps/src' THIRDSRC=${THIRD_PARTY_SRC_DIR:-thirdsrc}