Skip to content

Commit

Permalink
GH-45361: [CI][C++] Curate ci/vcpkg/vcpkg.json (#45081)
Browse files Browse the repository at this point in the history
### Rationale for this change

Our CI config for vcpkg declares superfluous Boost dependencies.

### Are these changes tested?

Yes, by existing CI tests.

### Are there any user-facing changes?

No.
* GitHub Issue: #45361

Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
  • Loading branch information
pitrou authored Jan 27, 2025
1 parent 2eba03f commit 1a01b40
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ TZ=UTC
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile.
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-01-08
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-08
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-01-27
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
Expand Down
7 changes: 2 additions & 5 deletions ci/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@
"homepage": "https://arrow.apache.org",
"supports": "x64 | (arm64 & !windows)",
"dependencies": [
"boost-filesystem",
{
"name": "boost-multiprecision",
"platform": "windows"
},
{
"name": "boost-system",
"platform": "windows"
},
"brotli",
"bzip2",
"curl",
Expand Down Expand Up @@ -42,6 +37,8 @@
"description": "Development dependencies",
"dependencies": [
"benchmark",
"boost-crc",
"boost-filesystem",
"boost-process",
"gtest"
]
Expand Down

0 comments on commit 1a01b40

Please sign in to comment.