-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GH-43416: [CI] Upgrade our vcpkg version on .env #43417
base: main
Are you sure you want to change the base?
Conversation
|
@github-actions crossbow submit -g vcpkg wheel java-jars |
|
@github-actions crossbow submit -g vcpkg -g wheel java-jars |
This comment was marked as outdated.
This comment was marked as outdated.
@github-actions crossbow submit python-wheel-manylinux-2-28 |
|
@github-actions crossbow submit wheel-manylinux-2-28-cp39-amd64 |
Revision: a60bc06 Submitted crossbow builds: ursacomputing/crossbow @ actions-243699443d
|
I am unsure why ORC is failing to build when calling
I can see we define (since #43011):
debugging locally I can see we use ORC
@kou any idea why fetchcontent building ORC might not see the defined |
@github-actions crossbow submit wheel-manylinux-2-28-cp39-amd64 |
I am not sure why but applying the patch here: ee89232 is able to build orc edited commit |
Revision: 982a6ce Submitted crossbow builds: ursacomputing/crossbow @ actions-46a723f68f
|
2abb87d
to
ee89232
Compare
I am currently trying to understand why
|
@github-actions crossbow submit wheel-macos-big-sur-cp310-arm64 |
Revision: 2cedbe6 Submitted crossbow builds: ursacomputing/crossbow @ actions-08db436a21
|
Hmm. It seems that https://github.com/apache/orc/blob/23044d79a26cf8792bcb1936ab601308b0781962/cmake_modules/ThirdpartyToolchain.cmake#L416-L418 wasn't used. It means that arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake Lines 4524 to 4529 in 187197c
Could you debug print BTW, the ORC code should be fixed: diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 79324984a..f0808715b 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -466,13 +466,13 @@ if (ORC_PACKAGE_KIND STREQUAL "conan")
elseif (NOT "${PROTOBUF_HOME}" STREQUAL "")
find_package (Protobuf REQUIRED)
- if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB})
+ if (ORC_PREFER_STATIC_PROTOBUF AND PROTOBUF_STATIC_LIB)
add_resolved_library (orc_protobuf ${PROTOBUF_STATIC_LIB} ${PROTOBUF_INCLUDE_DIR})
else ()
add_resolved_library (orc_protobuf ${PROTOBUF_LIBRARY} ${PROTOBUF_INCLUDE_DIR})
endif ()
- if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB})
+ if (ORC_PREFER_STATIC_PROTOBUF AND PROTOC_STATIC_LIB)
add_resolved_library (orc_protoc ${PROTOC_STATIC_LIB} ${PROTOBUF_INCLUDE_DIR})
else ()
add_resolved_library (orc_protoc ${PROTOC_LIBRARY} ${PROTOBUF_INCLUDE_DIR}) @wgtmac Could you fix the ORC side problem (that is not related to this PR's failure)? We should not use |
@kou Sorry for the issue caused by ORC. Let me take a look. |
Thanks! |
@kou you lost me with this comment, are you talking about the ORC issue here or the flight issue with protobuf? other logs about where
|
The ORC issue here. I don't think that the |
ah! ok, that makes sense. Thanks for your help! |
(I hope that I can take a look at the Flight issue tomorrow...) |
Thanks @kou, no worries, I am testing the orc issue and it seems like the FindProtobuf file from ORC isn't used. I'll keep testing and will share findings. |
ok, vcpkg uses
This does not populate diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index aa520ff..7bd75d1 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -416,6 +416,18 @@ endif ()
if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR ORC_PACKAGE_KIND STREQUAL "conan")
find_package (Protobuf REQUIRED)
set(PROTOBUF_VENDORED FALSE)
+ if (Protobuf_FOUND AND NOT PROTOBUF_STATIC_LIB)
+ get_target_property (target_type protobuf::libprotobuf TYPE)
+ if (target_type STREQUAL "STATIC_LIBRARY")
+ set(PROTOBUF_STATIC_LIB protobuf::libprotobuf)
+ endif ()
+ endif()
+ if (Protobuf_FOUND AND NOT PROTOC_STATIC_LIB)
+ get_target_property (target_type protobuf::libprotoc TYPE)
+ if (target_type STREQUAL "STATIC_LIBRARY")
+ set (PROTOC_STATIC_LIB protobuf::libprotoc)
+ endif ()
+ endif()
else ()
set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
set(PROTOBUF_INCLUDE_DIR "${PROTOBUF_PREFIX}/include")
|
I've tried to debug the
I tried setting the following to diff --git a/docker-compose.yml b/docker-compose.yml
index cf22324..674fe0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1132,6 +1132,10 @@ services:
- .:/arrow:delegated
- ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux-2-28-ccache:/ccache:delegated
command: /arrow/ci/scripts/python_wheel_manylinux_build.sh
+ cap_add:
+ - SYS_PTRACE
+ security_opt:
+ - apparmor:unconfined
python-wheel-manylinux-test-imports:
image: ${ARCH}/python:${PYTHON}
It seems that just executing
edit: added some more info. |
This problem #43417 (comment) may be already solved in upstream: apache/orc#1963 |
FYI, Apache ORC 2.0.2 will be scheduled in 2 weeks with the following. Is that the only one Apache ORC community fixes? |
Thanks for sharing the information. |
@luffy-zh has opened https://issues.apache.org/jira/browse/ORC-1751 and will fix it in 2.0.2. |
Wow! Thanks! |
What changes were proposed in this pull request? fix syntax error in ThirdpartyToolchain Why are the changes needed? Handle the issue discussed [here]( apache/arrow#43417) How was this patch tested? Test it locally Was this patch authored or co-authored using generative AI tooling? NO Closes #1994 from luffy-zh/ORC-1751. Authored-by: luffy-zh <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
### What changes were proposed in this pull request? fix syntax error in ThirdpartyToolchain ### Why are the changes needed? Handle the issue discussed [here]( apache/arrow#43417) ### How was this patch tested? Test it locally ### Was this patch authored or co-authored using generative AI tooling? NO Closes #1997 from luffy-zh/branch-2.0. Authored-by: luffy-zh <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
@github-actions crossbow submit wheel-manylinux-2-28-cp39-amd64 |
Revision: e939b3d Submitted crossbow builds: ursacomputing/crossbow @ actions-40f30280ce
|
Rationale for this change
We are using a pretty old version and we are seeing some CI jobs.
What changes are included in this PR?
Upgrade vcpkg version
Are these changes tested?
on CI
Are there any user-facing changes?
No