GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

Sign up for GitHub

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

Closed
raulcd wants to merge 3 commits into from
Closed

GH-43416: [CI] Upgrade vcpkg version on our CI #46009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c878fa7
GH-43416: [CI] Upgrade vcpkg version on our CI
raulcd Apr 2, 2025
e431011
Temporarily add an absurd amount of time to the timeout
raulcd Apr 3, 2025
2142f6a
Add vcpkg debug logs to try and understand why it takes so long
raulcd Apr 17, 2025
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down
1 change: 1 addition & 0 deletions ci/docker/python-wheel-manylinux.dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
vcpkg install \
--debug \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
Expand Down
77 changes: 5 additions & 72 deletions ci/vcpkg/ports.patch
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
-DBUILD_TESTING=OFF
-DENABLE_CURL_MANUAL=OFF
-DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
OPTIONS_DEBUG
-DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",
1 change: 1 addition & 0 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
python_abi_tag: "{{ abi_tag }}"
python_version: "{{ python_version }}"
wheel_platform_tag: "{{ platform_tag }}"
timeout: 600 # 10 hours, absurd amount of time just to test
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
GH-43416: [CI] Upgrade vcpkg version on our CI#46009

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.

 Sign up for GitHub

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

 Closed

raulcd
wants to merge
3
commits into

from

 Closed


GH-43416: [CI] Upgrade vcpkg version on our CI
#46009
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c878fa7

GH-43416: [CI] Upgrade vcpkg version on our CI


raulcd Apr 2, 2025
e431011

Temporarily add an absurd amount of time to the timeout


raulcd Apr 3, 2025
2142f6a

Add vcpkg debug logs to try and understand why it takes so long


raulcd Apr 17, 2025

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,7 +90,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="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="b02e341c927f16d991edbd915d8ea43eac52096c" # 2025.03.19 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
Expand Down

1 change: 1 addition & 0 deletions
ci/docker/python-wheel-manylinux.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,7 @@ RUN --mount=type=secret,id=github_repository_owner \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg} && \
 vcpkg install \
 --debug \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand Down

77 changes: 5 additions & 72 deletions
ci/vcpkg/ports.patch

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
 -DBUILD_TESTING=OFF
 -DENABLE_CURL_MANUAL=OFF
 -DCURL_CA_FALLBACK=ON
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
 OPTIONS_DEBUG
 -DENABLE_DEBUG=ON
+ ${EXTRA_ARGS_DEBUG}
 )
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All@@ -29,16 +12,19 @@ index a79c72a59..6b7fa6a66 100644

 vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
index c33046b..baf2c5e 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -8,5 +8,6 @@ vcpkg_from_github(
@@ -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
new file mode 100644
index 000000000..e839c93a4
Expand All@@ -64,56 +50,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",

1 change: 1 addition & 0 deletions
dev/tasks/tasks.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -239,6 +239,7 @@ tasks:
 python_abi_tag: "{{ abi_tag }}"
 python_version: "{{ python_version }}"
 wheel_platform_tag: "{{ platform_tag }}"
 timeout: 600 # 10 hours, absurd amount of time just to test
 artifacts:
 - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
{% endfor %}
Expand Down