Skip to content

Commit 0897b02

Browse files
committed
Disable cmake and enable build
1 parent 4a488e8 commit 0897b02

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,11 @@ jobs:
370370
- name: Download Timezone Database
371371
shell: bash
372372
run: ci/scripts/download_tz_database.sh
373-
- name: Install cmake
374-
shell: bash
375-
run: |
376-
ci/scripts/install_cmake.sh 4.1.2 /usr
373+
# Disable cmake for make it work with vcpkg.
374+
# - name: Install cmake
375+
# shell: bash
376+
# run: |
377+
# ci/scripts/install_cmake.sh 4.1.2 /usr
377378
- name: Install ccache
378379
shell: bash
379380
run: |
@@ -429,18 +430,18 @@ jobs:
429430
run: |
430431
vcpkg fetch nuget
431432
# -AL- TEMP disable.
432-
# - name: Build
433-
# shell: cmd
434-
# run: |
435-
# set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
436-
# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
437-
# set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
438-
# bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
433+
- name: Build
434+
shell: cmd
435+
run: |
436+
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
437+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
438+
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
439+
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
439440
440-
# - name: Register Flight SQL ODBC Driver
441-
# shell: cmd
442-
# run: |
443-
# call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
441+
- name: Register Flight SQL ODBC Driver
442+
shell: cmd
443+
run: |
444+
call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
444445
# GH-48270 TODO: Resolve segementation fault during Arrow library unload
445446
# GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI
446447
# GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.

0 commit comments

Comments
 (0)