Skip to content

Commit

Permalink
apacheGH-35099: [CI][Packaging] Upgrade vcpkg to 2023.04.15 Release (a…
Browse files Browse the repository at this point in the history
…pache#35430)

### Rationale for this change

- apache#34818 pinned vcpkg to a non-release master branch commit.
- This was to include unreleased changes, specifically microsoft/vcpkg#29674.

### What changes are included in this PR?

This pins vcpkg to the official 2023.04.15 release (commit microsoft/vcpkg@501db0f)

### 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: apache#35099

Authored-by: Simon Perkins <simon.perkins@gmail.com>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
  • Loading branch information
sjperkins authored and ArgusLi committed May 15, 2023
1 parent b340bb8 commit 2593b49
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
7 changes: 1 addition & 6 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 1 addition & 14 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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()

0 comments on commit 2593b49

Please sign in to comment.