From e609b13c62fd55373020a9c66c11c64b02e78c20 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 4 May 2023 08:37:13 +0200 Subject: [PATCH 1/3] Upgrade vcpkg to 2023.04.15 release --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 58399c494c869..6e7f74916d3c6 100644 --- a/.env +++ b/.env @@ -96,8 +96,7 @@ DEVTOOLSET_VERSION= # Please also update the crossbow configuration in order to keep the github # actions cache up to date for the macOS wheels: # https://github.com/ursacomputing/crossbow/blob/master/.github/workflows/cache_vcpkg.yml -# TODO: Update to an official release tag https://github.com/apache/arrow/issues/35099 -VCPKG="b619a233fbf7b2c9765fb4458f3ecb05bd3166e3" # 2023.04.03 +VCPKG="501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" # 2023.04.15 Release # This must be updated when we update # ci/docker/python-wheel-windows-vs2017.dockerfile. From 4faab9914905927a90f7e1f0294d5078adbac7a6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 4 May 2023 10:45:32 +0200 Subject: [PATCH 2/3] Remove non-applicable scripts/cmake/vcpkg_find_acquire_program.cmake patch --- ci/vcpkg/ports.patch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch index c873bfbb06a11..1a7b539d7af6c 100644 --- a/ci/vcpkg/ports.patch +++ b/ci/vcpkg/ports.patch @@ -49,18 +49,5 @@ index 0000000000..a57ce0c22f + return v & ~(mask << (8 * n)); +-#endif + } -+ ++ + static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) { -diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake -index 4611af6..d11936f 100644 ---- a/scripts/cmake/vcpkg_find_acquire_program.cmake -+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake -@@ -239,7 +239,7 @@ function(vcpkg_find_acquire_program program) - set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") - vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) - else() -- set(program_name python3) -+ set(program_name python) - set(brew_package_name "python") - set(apt_package_name "python3") - endif() From 996cd86726477fd337459b59dad2a97abc25fb18 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Thu, 4 May 2023 10:57:18 +0200 Subject: [PATCH 3/3] Remove unnecessary crossbox configuration comment --- .env | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.env b/.env index 6e7f74916d3c6..954a313053ed8 100644 --- a/.env +++ b/.env @@ -92,10 +92,6 @@ DEVTOOLSET_VERSION= # 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. -# -# Please also update the crossbow configuration in order to keep the github -# actions cache up to date for the macOS wheels: -# https://github.com/ursacomputing/crossbow/blob/master/.github/workflows/cache_vcpkg.yml VCPKG="501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" # 2023.04.15 Release # This must be updated when we update