Skip to content
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 vcpkg version on our CI #44919

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TZ=UTC
# Used through docker-compose.yml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
# docker tags more readable.
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
VCPKG="b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" # 2024.11.16 Release

# This must be updated when we update
# ci/docker/python-wheel-windows-vs2019.dockerfile.
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/python_wheel_manylinux_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ cmake \
${ARROW_EXTRA_CMAKE_FLAGS} \
-G ${CMAKE_GENERATOR} \
/arrow/cpp
cmake --build . --target install
cmake --build . --verbose --target install
popd

# Check that we don't expose any unwanted symbols
Expand Down
73 changes: 9 additions & 64 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
index 841bd7e0f..73c21c9ea 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
@@ -75,6 +75,8 @@ vcpkg_cmake_configure(
-DBUILD_TESTING=OFF
-DENABLE_CURL_MANUAL=OFF
-DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
-DCURL_USE_PKGCONFIG=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
OPTIONS_DEBUG
-DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
MAYBE_UNUSED_VARIABLES
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All @@ -29,15 +25,17 @@ index a79c72a59..6b7fa6a66 100644

vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0c7098082..c603c3653 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
PATCHES
@@ -8,7 +8,9 @@ vcpkg_from_github(
fix_clang-cl_build.patch
no-werror.patch
pkgconfig.diff
+ "snappy-disable-bmi.patch"
)
+
file(COPY "${CURRENT_PORT_DIR}/snappy.pc.in" DESTINATION "${SOURCE_PATH}")

vcpkg_cmake_configure(
diff --git a/ports/snappy/snappy-disable-bmi.patch b/ports/snappy/snappy-disable-bmi.patch
Expand Down Expand Up @@ -65,56 +63,3 @@ index 000000000..e839c93a4
+ }
+
+ static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {
diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake
index 1501782..71d2147 100644
--- a/ports/thrift/portfile.cmake
+++ b/ports/thrift/portfile.cmake
@@ -12,7 +12,7 @@ vcpkg_find_acquire_program(BISON)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/thrift
- REF "${VERSION}"
+ REF "v${VERSION}"
SHA512 5e4ee9870b30fe5ba484d39781c435716f7f3903793dc8aae96594ca813b1a5a73363b84719038ca8fa3ab8ef0a419a28410d936ff7b3bbadf36fc085a6883ae
HEAD_REF master
PATCHES
diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json
index 2d5a854..9ff49ec 100644
--- a/ports/thrift/vcpkg.json
+++ b/ports/thrift/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "thrift",
"version": "0.20.0",
+ "port-version": 1,
"description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.",
"homepage": "https://github.com/apache/thrift",
"license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index c6ce736..9ad1d63 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8622,7 +8622,7 @@
},
"thrift": {
"baseline": "0.20.0",
- "port-version": 0
+ "port-version": 1
},
"tidy-html5": {
"baseline": "5.8.0",
diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json
index 3db38c5..7464bde 100644
--- a/versions/t-/thrift.json
+++ b/versions/t-/thrift.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "13757a6b05741cf3c9c39e3a1dcc5e5cd685e025",
+ "version": "0.20.0",
+ "port-version": 1
+ },
{
"git-tree": "6855be1ce96497811d4eb0a9879baf6cf1b3610c",
"version": "0.20.0",
3 changes: 3 additions & 0 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4717,6 +4717,9 @@ function(build_orc)
if(TARGET absl::log_internal_check_op)
target_link_libraries(orc::orc INTERFACE absl::log_internal_check_op)
endif()
if(TARGET absl::log_internal_nullguard)
target_link_libraries(orc::orc INTERFACE absl::log_internal_nullguard)
endif()
if(NOT MSVC)
if(NOT APPLE AND ARROW_ENABLE_THREADING)
target_link_libraries(orc::orc INTERFACE Threads::Threads)
Expand Down
Loading