This is an automated email from the ASF dual-hosted git repository.
kou pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
from 8a93741349 ARROW-18390: [CI][Python] Update spark test modules to
match spark master (#14715)
add c0b311ee83 ARROW-18361: [CI][Conan] Merge upstream changes (#14671)
No new revisions were added by this update.
Summary of changes:
ci/conan/all/conandata.yml | 113 +++---
ci/conan/all/conanfile.py | 406 +++++++++++--------
ci/conan/all/patches/1.0.0-0001-cmake.patch | 114 ------
ci/conan/all/patches/1.0.0-0002-jemalloc.patch | 65 ---
.../patches/1.0.0-0005-fix-make12-namespace.patch | 44 ++
ci/conan/all/patches/1.0.0-0006-fix-cmake.patch | 355 ++++++++++++++++
...atch => 10.0.0-0001-mallctl-takes-size_t.patch} | 12 +-
ci/conan/all/patches/10.0.0-0002-fix-cmake.patch | 333 +++++++++++++++
ci/conan/all/patches/2.0.0-0001-cmake.patch | 41 --
ci/conan/all/patches/2.0.0-0002-jemalloc.patch | 65 ---
.../all/patches/2.0.0-0006-gandiva-llvm-re2.patch | 100 -----
.../all/patches/2.0.0-0007-fix-protoc-cmake.patch | 33 --
ci/conan/all/patches/2.0.0-0008-fix-cmake.patch | 295 ++++++++++++++
ci/conan/all/patches/7.0.0-0001-cmake.patch | 35 --
ci/conan/all/patches/7.0.0-0002-jemalloc.patch | 48 ---
.../patches/7.0.0-0004-remove-find-modules.patch | 22 -
.../all/patches/7.0.0-0005-use-find-package.patch | 440 --------------------
ci/conan/all/patches/7.0.0-0007-fix-cmake.patch | 369 +++++++++++++++++
ci/conan/all/patches/8.0.0-0001-cmake.patch | 35 --
ci/conan/all/patches/8.0.0-0002-jemalloc.patch | 48 ---
.../all/patches/8.0.0-0004-use-find-package.patch | 401 ------------------
ci/conan/all/patches/8.0.0-0006-fix-cmake.patch | 447 +++++++++++++++++++++
ci/conan/all/test_package/CMakeLists.txt | 16 +-
ci/conan/all/test_package/conanfile.py | 22 +-
ci/conan/all/{ => test_v1_package}/CMakeLists.txt | 10 +-
.../{test_package => test_v1_package}/conanfile.py | 11 +-
ci/conan/config.yml | 2 +
ci/conan/merge_status.sh | 2 +-
cpp/CMakeLists.txt | 4 +-
.../{FindBrotli.cmake => FindBrotliAlt.cmake} | 43 +-
.../{Findjemalloc.cmake => FindjemallocAlt.cmake} | 70 ++--
cpp/cmake_modules/Findutf8proc.cmake | 2 +-
cpp/cmake_modules/ThirdpartyToolchain.cmake | 17 +-
33 files changed, 2262 insertions(+), 1758 deletions(-)
delete mode 100644 ci/conan/all/patches/1.0.0-0001-cmake.patch
delete mode 100644 ci/conan/all/patches/1.0.0-0002-jemalloc.patch
create mode 100644 ci/conan/all/patches/1.0.0-0005-fix-make12-namespace.patch
create mode 100644 ci/conan/all/patches/1.0.0-0006-fix-cmake.patch
copy ci/conan/all/patches/{8.0.0-0003-mallctl-takes-size_t.patch =>
10.0.0-0001-mallctl-takes-size_t.patch} (82%)
create mode 100644 ci/conan/all/patches/10.0.0-0002-fix-cmake.patch
delete mode 100644 ci/conan/all/patches/2.0.0-0001-cmake.patch
delete mode 100644 ci/conan/all/patches/2.0.0-0002-jemalloc.patch
delete mode 100644 ci/conan/all/patches/2.0.0-0006-gandiva-llvm-re2.patch
delete mode 100644 ci/conan/all/patches/2.0.0-0007-fix-protoc-cmake.patch
create mode 100644 ci/conan/all/patches/2.0.0-0008-fix-cmake.patch
delete mode 100644 ci/conan/all/patches/7.0.0-0001-cmake.patch
delete mode 100644 ci/conan/all/patches/7.0.0-0002-jemalloc.patch
delete mode 100644 ci/conan/all/patches/7.0.0-0004-remove-find-modules.patch
delete mode 100644 ci/conan/all/patches/7.0.0-0005-use-find-package.patch
create mode 100644 ci/conan/all/patches/7.0.0-0007-fix-cmake.patch
delete mode 100644 ci/conan/all/patches/8.0.0-0001-cmake.patch
delete mode 100644 ci/conan/all/patches/8.0.0-0002-jemalloc.patch
delete mode 100644 ci/conan/all/patches/8.0.0-0004-use-find-package.patch
create mode 100644 ci/conan/all/patches/8.0.0-0006-fix-cmake.patch
rename ci/conan/all/{ => test_v1_package}/CMakeLists.txt (83%)
copy ci/conan/all/{test_package => test_v1_package}/conanfile.py (83%)
rename cpp/cmake_modules/{FindBrotli.cmake => FindBrotliAlt.cmake} (82%)
rename cpp/cmake_modules/{Findjemalloc.cmake => FindjemallocAlt.cmake} (56%)
