[arrow] branch main updated: GH-35099: [CI][Packaging] Upgrade vcpkg to 2023.04.15 Release (#35430)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 2c971511a1 GH-35099: [CI][Packaging] Upgrade vcpkg to 2023.04.15 
Release (#35430)
2c971511a1 is described below

commit 2c971511a1f59856b048416ea890743d382c0029
Author: Simon Perkins <simon.perk...@gmail.com>
AuthorDate: Sat May 6 22:23:16 2023 +0200

    GH-35099: [CI][Packaging] Upgrade vcpkg to 2023.04.15 Release (#35430)
    
    
    
    ### Rationale for this change
    
    - https://github.com/apache/arrow/pull/34818 pinned vcpkg to a non-release 
master branch commit.
    - This was to include unreleased changes, specifically 
https://github.com/microsoft/vcpkg/issues/29674.
    
    ### What changes are included in this PR?
    
    This pins vcpkg to the official 2023.04.15 release (commit 
https://github.com/microsoft/vcpkg/commit/501db0f17ef6df184fcdbfbe0f87cde2313b6ab1)
    
    ### Are these changes tested?
    
    I've successfully test that the following local wheel builds succeed:
    
    ```bash
    $ ARCH=amd64 PYTHON=3.10 archery docker run python-wheel-manylinux-2014
    $ ARCH=amd64 PYTHON=3.10 archery docker run python-wheel-manylinux-2-28
    ```
    
    ### Are there any user-facing changes?
    
    I don't believe so
    
    * Closes: #35099
    
    Authored-by: Simon Perkins <simon.perk...@gmail.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 .env                 |  7 +------
 ci/vcpkg/ports.patch | 15 +--------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.env b/.env
index 58399c494c..954a313053 100644
--- a/.env
+++ b/.env
@@ -92,12 +92,7 @@ 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
-# 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.
diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch
index c873bfbb06..1a7b539d7a 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()