Skip to content

Commit a17e568

Browse files
committed
Merge remote-tracking branch 'origin/main' into apachegh-49841-int-pow2-guard
The BitWidth and HasSingleBit helpers added in apache#53946 replaced four of the five guard sites, so only the two guards in bit_util.h still need the new macro. Signed-off-by: 1fanwang <[email protected]>
2 parents d0eb576 + d9a0ab4 commit a17e568

485 files changed

Lines changed: 20205 additions & 17046 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ github:
3838
- hiroyuki-sato
3939
- HyukjinKwon
4040
- Reranko05
41+
- rustyconover
4142

4243
copilot_code_review:
4344
enabled: true

‎.env‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ TZ=UTC
9292
# Used through compose.yaml and serves as the default version for the
9393
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9494
# docker tags more readable.
95-
VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, upstream commit)
95+
VCPKG="61d7eaeb094a6acbc23d9c2e54de9208175fda47" # 2026.10.24 (not release, upstream commit)
9696

9797
# This must be updated when we update
9898
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9999
# This is a workaround for our CI problem that "archery docker build" doesn't
100100
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
101-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-09-09
102-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-09-14
101+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-10-28
102+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-11-28
103103

‎.github/actions/odbc-windows/action.yml‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,22 +54,26 @@ runs:
5454
path: ${{ steps.ccache-info.outputs.cache-dir }}
5555
key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
5656
restore-keys: cpp-odbc-ccache-windows-x64-
57-
- name: Checkout vcpkg
58-
uses: actions/checkout@v6
59-
with:
60-
persist-credentials: false
61-
fetch-depth: 0
62-
path: vcpkg
63-
repository: microsoft/vcpkg
64-
- name: Bootstrap vcpkg
65-
shell: pwsh
57+
- name: Install vcpkg
58+
shell: bash
6659
run: |
67-
vcpkg\bootstrap-vcpkg.bat
68-
$VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
69-
Write-Output ${VCPKG_ROOT} | `
70-
Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
71-
Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
72-
Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
60+
# GH-55316: Use the vcpkg version pinned in .env and apply
61+
# ci/vcpkg/ports.patch like other vcpkg based builds do.
62+
ci/scripts/install_vcpkg.sh vcpkg
63+
VCPKG_ROOT=$(cygpath --windows "$(pwd)/vcpkg")
64+
echo "${VCPKG_ROOT}" >> "${GITHUB_PATH}"
65+
echo "VCPKG_ROOT=${VCPKG_ROOT}" >> "${GITHUB_ENV}"
66+
# We use manifest mode with builtin-baseline. vcpkg resolves
67+
# ports from its versions database in manifest mode, so local
68+
# changes by ports.patch are ignored unless the patched ports
69+
# are used as overlay ports.
70+
vcpkg_ports_dir=$(cygpath --mixed "$(pwd)/vcpkg/ports")
71+
overlay_ports=()
72+
for port in $(sed -n -E 's,^diff --git a/ports/([^/]+)/.*,\1,p' \
73+
ci/vcpkg/ports.patch | sort -u); do
74+
overlay_ports+=("${vcpkg_ports_dir}/${port}")
75+
done
76+
echo "VCPKG_OVERLAY_PORTS=$(IFS=';'; echo "${overlay_ports[*]}")" >> "${GITHUB_ENV}"
7377
- name: Setup NuGet credentials for vcpkg caching
7478
shell: bash
7579
run: |
@@ -83,11 +87,15 @@ runs:
8387
$(vcpkg fetch nuget | tail -n 1) \
8488
setapikey "${{ inputs.github-token }}" \
8589
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
90+
- name: Find Visual Studio
91+
shell: pwsh
92+
run: |
93+
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
8694
- name: Build
8795
shell: cmd
8896
run: |
8997
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
90-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
98+
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
9199
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
92100
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
93101
- name: Register Flight SQL ODBC Driver

‎.github/workflows/cpp.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
fetch-depth: 0
124124
submodules: recursive
125125
- name: Restore Docker Volumes
126-
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
126+
uses: apache/infrastructure-actions/stash/restore@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
127127
with:
128128
path: .docker
129129
key: cpp-${{ matrix.image }}
@@ -154,7 +154,7 @@ jobs:
154154
- name: Save Docker Volumes
155155
if: ${{ !cancelled() }}
156156
continue-on-error: true
157-
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
157+
uses: apache/infrastructure-actions/stash/save@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
158158
with:
159159
path: .docker
160160
key: cpp-${{ matrix.image }}
@@ -262,7 +262,7 @@ jobs:
262262
run: |
263263
echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
264264
- name: Restore ccache
265-
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
265+
uses: apache/infrastructure-actions/stash/restore@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
266266
with:
267267
path: ${{ steps.ccache-info.outputs.cache-dir }}
268268
key: cpp-ccache-macos-${{ matrix.macos-version }}
@@ -285,7 +285,7 @@ jobs:
285285
- name: Save ccache
286286
if: ${{ !cancelled() }}
287287
continue-on-error: true
288-
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
288+
uses: apache/infrastructure-actions/stash/save@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
289289
with:
290290
path: ${{ steps.ccache-info.outputs.cache-dir }}
291291
key: cpp-ccache-macos-${{ matrix.macos-version }}
@@ -377,7 +377,7 @@ jobs:
377377
shell: msys2 {0}
378378
run: ci/scripts/msys2_setup.sh cpp
379379
- name: Restore ccache
380-
uses: apache/infrastructure-actions/stash/restore@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
380+
uses: apache/infrastructure-actions/stash/restore@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
381381
with:
382382
path: ccache
383383
key: cpp-ccache-${{ matrix.msystem_lower}}
@@ -389,7 +389,7 @@ jobs:
389389
- name: Save ccache
390390
if: ${{ !cancelled() }}
391391
continue-on-error: true
392-
uses: apache/infrastructure-actions/stash/save@547b55daa5d3c7e45383094ef738b7d16bc8ccc5
392+
uses: apache/infrastructure-actions/stash/save@d3a005f07dd94a34d11361b0287b0c1fdc6d55f5
393393
with:
394394
path: ccache
395395
key: cpp-ccache-${{ matrix.msystem_lower}}

0 commit comments

Comments
 (0)