Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,9 @@ jobs:
key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
restore-keys: cpp-ccache-macos-
- name: Build
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
# pin LLVM version on MacOS to 14 ARROW-17902
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
export LLVM_ROOT=$(brew --prefix llvm@14)
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
- name: Test
shell: bash
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,9 @@ jobs:
-r python/requirements-test.txt
- name: Build
shell: bash
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
# pin LLVM version on MacOS to 14 ARROW-17902
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
export LLVM_ROOT=$(brew --prefix llvm@14)
export PYTHON=python3
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
ci/scripts/python_build.sh $(pwd) $(pwd)/build
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,9 @@ jobs:
key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
restore-keys: ruby-ccache-macos-
- name: Build C++
# use brew version of clang, to be consistent with LLVM lib, see ARROW-17790.
# pin LLVM version on MacOS to 14 ARROW-17902
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
export LLVM_ROOT=$(brew --prefix llvm@14)
ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
- name: Build GLib
run: |
Expand Down
3 changes: 2 additions & 1 deletion cpp/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ brew "git"
brew "glog"
brew "googletest"
brew "grpc"
brew "llvm"
# pin LLVM version on MacOS to 14 ARROW-17902
brew "llvm@14"
brew "llvm@12"
brew "lz4"
brew "ninja"
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/gandiva/gdv_function_stubs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ int32_t gdv_fn_populate_varlen_vector(int64_t context_ptr, int8_t* data_ptr,
if (buffer->capacity() < new_size) {
auto status =
buffer->Reserve(std::max(buffer->capacity() * 2, static_cast<int64_t>(new_size)));
if (!status.ok()) {
// ARROW-17869 Java's buffer type doesn't support reserve
if (!status.ok() && !status.IsNotImplemented()) {
auto context = reinterpret_cast<gandiva::ExecutionContext*>(context_ptr);

context->set_error_msg(status.message().c_str());
return -1;
}
Expand Down
2 changes: 2 additions & 0 deletions dev/tasks/java-jars/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ jobs:
run: |
arrow/ci/scripts/ccache_setup.sh
- name: Build C++ libraries
# pin LLVM version on MacOS to 14 ARROW-17902
run: |
export LLVM_ROOT=$(brew --prefix llvm@14)
set -e
arrow/ci/scripts/java_jni_macos_build.sh \
$GITHUB_WORKSPACE/arrow \
Expand Down
4 changes: 2 additions & 2 deletions dev/tasks/verify-rc/github.macos.amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
{% if use_conda %}
USE_CONDA: 1
{% endif %}
# pin LLVM version on MacOS to 14 ARROW-17902
run: |
export CC=$(brew --prefix llvm)/bin/clang
export CXX=$(brew --prefix llvm)/bin/clang++
export LLVM_ROOT=$(brew --prefix llvm@14)
arrow/dev/release/verify-release-candidate.sh {{ release|default("") }} {{ rc|default("") }}