Skip to content

GH-51494: [CI][C++] Detect Visual Studio installed path instead of hardcoding it #51610

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

Merged
kou merged 4 commits into from
Sep 29, 2026
+45 −19
Merged

GH-51494: [CI][C++] Detect Visual Studio installed path instead of hardcoding it #51610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4824b26
GH-51494: [CI][C++] Detect Visual Studio installed path instead of ha…
raulcd Sep 28, 2026
a912355
Split finding path on a different bash step so we don't have to use w…
raulcd Sep 28, 2026
27e0e6b
Use powershell instead of bash
raulcd Sep 29, 2026
5480dde
Add search for visual studio path everywhere where we were hardcoding…
raulcd Sep 29, 2026
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
6 changes: 5 additions & 1 deletion .github/actions/odbc-windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,15 @@ runs:
$(vcpkg fetch nuget | tail -n 1) \
setapikey "${{ inputs.github-token }}" \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
- name: Build
shell: cmd
run: |
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
- name: Register Flight SQL ODBC Driver
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/cpp_extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,15 @@ jobs:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: jni-windows

- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV

- name: CMake
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
cmake ^
-S cpp ^
-B cpp.build ^
Expand All @@ -432,13 +437,13 @@ jobs:
- name: Build
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
cmake --build cpp.build

- name: Install
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
cmake --install cpp.build

- name: Test
Expand All @@ -448,7 +453,7 @@ jobs:
ARROW_TEST_DATA: ${{ github.workspace }}\testing\data
PARQUET_TEST_DATA: ${{ github.workspace }}\cpp\submodules\parquet-testing\data
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
set TZDIR=%MSYS2_LOCATION%\usr\share\zoneinfo

set exclude_tests=arrow-acero-asof-join-node-test
Expand All @@ -465,7 +470,7 @@ jobs:
- name: Build example
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1

cmake ^
-S cpp/examples/minimal_build ^
Expand Down Expand Up @@ -728,7 +733,7 @@ jobs:
shell: cmd
run: |
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
# Convert VCPKG Windows path to MSYS path
for /f "usebackq delims=" %%I in (`bash -c "cygpath -u \"$VCPKG_ROOT_KEEP\""` ) do set VCPKG_ROOT=%%I
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/cpp_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,16 @@ jobs:
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: cpp-ccache-windows-${{ inputs.arch }}
- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
- name: Build
shell: cmd
env:
VCVARS_ARCH: ${{ inputs.arch }}
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH%
Comment thread
raulcd marked this conversation as resolved.
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH% || exit /b 1
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
- name: Save ccache
if: ${{ !cancelled() }}
Expand All @@ -135,7 +139,7 @@ jobs:
VCVARS_ARCH: ${{ inputs.arch }}
MSYS2_LOCATION: ${{ steps.setup-msys2.outputs.msys2-location }}
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH%
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_ARCH% || exit /b 1
# For ORC
set TZDIR=%MSYS2_LOCATION%\usr\share\zoneinfo
bash -c "ci/scripts/cpp_test.sh $(pwd) $(pwd)/build"
6 changes: 5 additions & 1 deletion .github/workflows/matlab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,14 @@ jobs:
${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-windows-${{ hashFiles('cpp/**', 'matlab/**', '!matlab/build/**') }}
restore-keys: matlab-ccache-windows-
- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
- name: Build MATLAB Interface
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
bash -c "ci/scripts/matlab_build.sh $(pwd)"
- name: Run MATLAB Tests
env:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,18 +450,22 @@ jobs:
$(vcpkg fetch nuget | tail -n 1) \
setapikey "${{ secrets.GITHUB_TOKEN }}" \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
- name: Build C++
shell: cmd
run: |
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
- name: Build GLib
shell: cmd
run: |
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
bash -c "ci/scripts/c_glib_build.sh $(pwd) $(pwd)/build"
- name: Save ccache
Expand Down
6 changes: 3 additions & 3 deletions ci/scripts/python_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ py -0p

%PYTHON_CMD% -m sysconfig || exit /B 1

@REM Setup MSVC environment

call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
@REM Setup MSVC environment. Find the Visual Studio Path first.
for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do set "VS_INSTALL_PATH=%%i"
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /B 1
@echo on

echo "=== CCACHE Stats before build ==="
Expand Down
7 changes: 4 additions & 3 deletions dev/release/verify-release-candidate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ set PATH=%INSTALL_DIR%\bin;%PATH%
mkdir !ARROW_SOURCE!\cpp\build
pushd !ARROW_SOURCE!\cpp\build

@rem This is the path for Visual Studio Community 2017
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
@REM Setup MSVC environment. Find the Visual Studio Path first.
for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do set "VS_INSTALL_PATH=%%i"
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /B 1
Comment thread
raulcd marked this conversation as resolved.

@rem NOTE(wesm): not using Ninja for now to be able to more easily control the
@rem generator used
Expand Down Expand Up @@ -116,7 +117,7 @@ cmake -G "%GENERATOR%" ^
-DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ^
-DCMAKE_UNITY_BUILD=ON ^
-DPARQUET_REQUIRE_ENCRYPTION=ON ^
.. || exit /B
.. || exit /B 1

cmake --build . --target INSTALL --config Release || exit /B 1

Expand Down
6 changes: 5 additions & 1 deletion dev/tasks/matlab/github.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,16 @@ jobs:
shell: bash
run: arrow/ci/scripts/install_sccache.sh pc-windows-msvc $(pwd)/sccache
{{ macros.github_configure_aws_credentials()|indent }}
- name: Find Visual Studio
shell: pwsh
run: |
"VS_INSTALL_PATH=$(vswhere -latest -property installationPath)" >> $env:GITHUB_ENV
- name: Build MATLAB Interface
shell: cmd
env:
{{ macros.github_set_sccache_envvars()|indent(8) }}
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "%VS_INSTALL_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 || exit /b 1
bash -c "arrow/ci/scripts/matlab_build.sh $(pwd)/arrow"
- name: Compress into single artifact
shell: bash
Expand Down
Loading