diff --git a/.github/workflows/build-thirdparty.yml b/.github/workflows/build-thirdparty.yml index 575e0e908b394f..73d2be34a32750 100644 --- a/.github/workflows/build-thirdparty.yml +++ b/.github/workflows/build-thirdparty.yml @@ -65,16 +65,17 @@ jobs: run: | git clone -b v7 https://github.com/easimon/maximize-build-space - - name: Maximize build space - uses: ./maximize-build-space - with: - root-reserve-mb: 4096 - swap-size-mb: 8192 - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' + #- name: Maximize build space + # uses: ./maximize-build-space + # with: + # root-reserve-mb: 4096 + # temp-reserve-mb: 4096 + # swap-size-mb: 8192 + # remove-dotnet: 'true' + # remove-android: 'true' + # remove-haskell: 'true' + # remove-codeql: 'true' + # remove-docker-images: 'true' - name: Checkout ${{ github.ref }} uses: actions/checkout@v4 @@ -135,8 +136,18 @@ jobs: export CMAKE_POLICY_VERSION_MINIMUM=3.10 export CUSTOM_CMAKE="/usr/local/bin/cmake" + #export TMPDIR=/home/runner/work/doris/doris/.tmp + #export TMP=$TMPDIR + #export TEMP=$TMPDIR + #mkdir -p $TMPDIR + + df -h + echo $TMPDIR + echo $RUNNER_TEMP + cd thirdparty - ./build-thirdparty.sh -j "$(nproc)" + #./build-thirdparty.sh -j "$(nproc)" + ./build-thirdparty.sh -j 2 build_macos: name: Build Third Party Libraries (macOS) @@ -195,7 +206,12 @@ jobs: export CMAKE_POLICY_VERSION_MINIMUM=3.10 export CUSTOM_CMAKE="/usr/local/bin/cmake" + df -h + echo $TMPDIR + echo $RUNNER_TEMP + cd thirdparty + #./build-thirdparty.sh -j "$(nproc)" ./build-thirdparty.sh -j "$(nproc)" build_macos_arm64: @@ -255,6 +271,11 @@ jobs: export CMAKE_POLICY_VERSION_MINIMUM=3.10 export CUSTOM_CMAKE="/usr/local/bin/cmake" + df -h + echo $TMPDIR + echo $RUNNER_TEMP + cd thirdparty - ./build-thirdparty.sh -j "$(nproc)" + #./build-thirdparty.sh -j "$(nproc)" + ./build-thirdparty.sh -j 2 diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 330a5bc51a96d3..fc413fbb89624e 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -2028,6 +2028,21 @@ build_paimon_cpp() { # These libraries are built but not installed by default echo "Installing paimon-cpp internal dependencies..." + # Install paimon-cpp Arrow deps used by paimon parquet static libs. + # Keep them in an isolated directory to avoid clashing with Doris Arrow. + local paimon_deps_dir="${TP_INSTALL_DIR}/paimon-cpp/lib64/paimon_deps" + mkdir -p "${paimon_deps_dir}" + for paimon_arrow_dep in \ + libarrow.a \ + libarrow_filesystem.a \ + libarrow_dataset.a \ + libarrow_acero.a \ + libparquet.a; do + if [ -f "arrow_ep-install/lib/${paimon_arrow_dep}" ]; then + cp -v "arrow_ep-install/lib/${paimon_arrow_dep}" "${paimon_deps_dir}/${paimon_arrow_dep}" + fi + done + # Install roaring_bitmap, renamed to avoid conflict with Doris's croaringbitmap if [ -f "release/libroaring_bitmap.a" ]; then cp -v "release/libroaring_bitmap.a" "${TP_INSTALL_DIR}/lib64/libroaring_bitmap_paimon.a" @@ -2259,6 +2274,9 @@ for package in "${packages[@]}"; do ${command} cd "${TP_DIR}" cleanup_package_source "${package}" + echo "debug after clean: ${package}" + df -h + du -sh "${TP_DIR}" fi done