From 555e39050687c0d75eeb34016b140b1e12ef9d46 Mon Sep 17 00:00:00 2001 From: Adonis Ling Date: Fri, 7 Jun 2024 10:54:25 +0800 Subject: [PATCH] [chore](be-ut) Fix the issues with BE UT when starting on macOS (#35946) The workflow BE UT (macOS) failed to be started due to missing libjvm.dylib. See https://github.com/apache/doris/actions/runs/9394949541/job/25873499203 --- .github/workflows/be-ut-mac.yml | 4 +++- run-be-ut.sh | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/be-ut-mac.yml b/.github/workflows/be-ut-mac.yml index 0df342bc6974ba..4f3db038dbab83 100644 --- a/.github/workflows/be-ut-mac.yml +++ b/.github/workflows/be-ut-mac.yml @@ -53,13 +53,14 @@ jobs: uses: ./.github/actions/ccache-action with: key: BE-UT-macOS - max-size: "2G" + max-size: "5G" restore-keys: BE-UT-macOS- - name: Run UT ${{ github.ref }} if: ${{ github.event_name == 'schedule' || steps.filter.outputs.be_changes == 'true' }} run: | cellars=( + 'm4' 'automake' 'autoconf' 'libtool' @@ -95,4 +96,5 @@ jobs: tar -xvf doris-thirdparty-prebuilt-darwin-x86_64.tar.xz popd + export JAVA_HOME="${JAVA_HOME_17_X64%\/}" ./run-be-ut.sh --run -j "$(nproc)" --clean diff --git a/run-be-ut.sh b/run-be-ut.sh index 74c950ef7424ea..0ab436973bc5e3 100755 --- a/run-be-ut.sh +++ b/run-be-ut.sh @@ -281,6 +281,7 @@ done < <(find "${CMAKE_BUILD_DIR}" -name "*gcda") setup_java_env() { local java_version + echo "JAVA_HOME: ${JAVA_HOME}" if [[ -z "${JAVA_HOME}" ]]; then return 1 fi @@ -302,6 +303,10 @@ setup_java_env() { else export LD_LIBRARY_PATH="${JAVA_HOME}/lib/${jvm_arch}/server:${JAVA_HOME}/lib/${jvm_arch}:${LD_LIBRARY_PATH}" fi + + if [[ "$(uname -s)" == 'Darwin' ]]; then + export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}" + fi } # prepare jvm if needed