Skip to content

Commit

Permalink
Try RelWithDebInfo
Browse files Browse the repository at this point in the history
  • Loading branch information
lriggs committed May 17, 2024
1 parent 382e08d commit 00d8c8a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 85 deletions.
2 changes: 1 addition & 1 deletion cpp/cmake_modules/SetupCxxFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include(CheckCXXSourceCompiles)

message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")

set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_BUILD_TYPE "RelWithDebInfo")

if(NOT DEFINED ARROW_CPU_FLAG)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|amd64|X86|x86|i[3456]86|x64")
Expand Down
84 changes: 0 additions & 84 deletions dev/tasks/java-jars/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,90 +83,11 @@ jobs:
run: archery docker push java-jni-manylinux-2014
{% endif %}

build-cpp-macos:
{% set arch = '${{ matrix.platform.arch }}' %}
name: Build C++ libraries macOS {{ arch }}
runs-on: {{ '${{ matrix.platform.runs_on }}' }}
strategy:
fail-fast: false
matrix:
platform:
- { runs_on: ["macos-12"], arch: "x86_64"}
env:
MACOSX_DEPLOYMENT_TARGET: "10.15"
steps:
{{ macros.github_checkout_arrow()|indent }}
- name: Set up Python
if: |
!contains(matrix.platform.runs_on, 'self-hosted')
uses: actions/setup-python@v4
with:
cache: 'pip'
python-version: 3.8
- name: Install Archery
shell: bash
run: pip install -e arrow/dev/archery[all]
- name: Install dependencies
run: |
# We want to use llvm@14 to avoid shared z3
# dependency. llvm@14 doesn't depend on z3 and llvm depends
# on z3. And Homebrew's z3 provides only shared library. It
# doesn't provides static z3 because z3's CMake doesn't accept
# building both shared and static libraries at once.
# See also: Z3_BUILD_LIBZ3_SHARED in
# https://github.com/Z3Prover/z3/blob/master/README-CMake.md
#
# If llvm is installed, Apache Arrow C++ uses llvm rather than
# llvm@14 because llvm is newer than llvm@14.
brew uninstall llvm || :
brew bundle --file=arrow/cpp/Brewfile
# We want to link aws-sdk-cpp statically but Homebrew's
# aws-sdk-cpp provides only shared library. If we have
# Homebrew's aws-sdk-cpp, our build mix Homebrew's
# aws-sdk-cpp and bundled aws-sdk-cpp. We uninstall Homebrew's
# aws-sdk-cpp to ensure using only bundled aws-sdk-cpp.
brew uninstall aws-sdk-cpp
# We want to use bundled RE2 for static linking. If
# Homebrew's RE2 is installed, its header file may be used.
# We uninstall Homebrew's RE2 to ensure using bundled RE2.
brew uninstall grpc || : # gRPC depends on RE2
brew uninstall [email protected] || : # gRPC 1.54 may be installed too
brew uninstall re2
# We want to use bundled Protobuf for static linking. If
# Homebrew's Protobuf is installed, its library file may be
# used on test We uninstall Homebrew's Protobuf to ensure using
# bundled Protobuf.
brew uninstall protobuf
brew bundle --file=arrow/java/Brewfile
- name: Build C++ libraries
env:
ARROW_USE_CCACHE: "ON"
run: |
set -e
# make brew Java available to CMake
if [ "{{ arch }}" = "aarch_64" ]; then
export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home
fi
arrow/ci/scripts/java_jni_macos_build.sh \
$GITHUB_WORKSPACE/arrow \
$GITHUB_WORKSPACE/arrow/cpp-build \
$GITHUB_WORKSPACE/arrow/java-dist
- name: Compress into single artifact to keep directory structure
run: tar -cvzf arrow-shared-libs-macos-{{ arch }}.tar.gz arrow/java-dist/
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: macos-shared-lib-{{ arch }}
path: arrow-shared-libs-macos-{{ arch }}.tar.gz

package-jars:
name: Build jar files
runs-on: macos-12
needs:
- build-cpp-ubuntu
- build-cpp-macos
steps:
{{ macros.github_checkout_arrow(fetch_depth=0)|indent }}
- name: Download Libraries
Expand All @@ -178,7 +99,6 @@ jobs:
mv artifacts/*/*.tar.gz .
tar -xvzf arrow-shared-libs-linux-x86_64.tar.gz
tar -xvzf arrow-shared-libs-linux-aarch_64.tar.gz
tar -xvzf arrow-shared-libs-macos-x86_64.tar.gz
- name: Test that shared libraries exist
run: |
set -x
Expand All @@ -193,10 +113,6 @@ jobs:
test -f arrow/java-dist/aarch_64/libarrow_orc_jni.so
test -f arrow/java-dist/aarch_64/libgandiva_jni.so
test -f arrow/java-dist/x86_64/libarrow_cdata_jni.dylib
test -f arrow/java-dist/x86_64/libarrow_dataset_jni.dylib
test -f arrow/java-dist/x86_64/libarrow_orc_jni.dylib
test -f arrow/java-dist/x86_64/libgandiva_jni.dylib
- name: Build bundled jar
run: |
set -e
Expand Down

0 comments on commit 00d8c8a

Please sign in to comment.