Skip to content

Commit a82b1e4

Browse files
committed
Check nuget paths in Ruby Glib and ODBC
1 parent 64db26d commit a82b1e4

File tree

2 files changed

+27
-14
lines changed

2 files changed

+27
-14
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ jobs:
347347
ARROW_BUILD_TESTS: ON
348348
ARROW_BUILD_TYPE: release
349349
ARROW_DEPENDENCY_SOURCE: VCPKG
350+
ARROW_DEPENDENCY_USE_SHARED: OFF
350351
ARROW_FLIGHT_SQL_ODBC: ON
351352
ARROW_SIMD_LEVEL: AVX2
352353
CMAKE_GENERATOR: Ninja
@@ -420,22 +421,27 @@ jobs:
420421
$(vcpkg fetch nuget | tail -n 1) \
421422
setapikey "${{ secrets.GITHUB_TOKEN }}" \
422423
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
423-
- name: Build
424-
shell: cmd
425-
run: |
426-
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
427-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
428-
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
429-
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
430-
- name: Register Flight SQL ODBC Driver
431-
shell: cmd
424+
- name: Show vcpkg NuGet
425+
shell: pwsh
432426
run: |
433-
call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
434-
# GH-48270 TODO: Resolve segementation fault during Arrow library unload
435-
# GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI
436-
# GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
427+
vcpkg fetch nuget
428+
# -AL- temp disable.
429+
# - name: Build
430+
# shell: cmd
431+
# run: |
432+
# set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
433+
# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
434+
# set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
435+
# bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
436+
# - name: Register Flight SQL ODBC Driver
437+
# shell: cmd
438+
# run: |
439+
# call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
440+
# # GH-48270 TODO: Resolve segementation fault during Arrow library unload
441+
# # GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI
442+
# # GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
437443

438-
# GH-47787 TODO: Build ODBC installer
444+
# # GH-47787 TODO: Build ODBC installer
439445

440446
report-extra-cpp:
441447
if: github.event_name == 'schedule' && always()

.github/workflows/ruby.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,17 @@ jobs:
422422
$(vcpkg fetch nuget | tail -n 1) \
423423
setapikey "${{ secrets.GITHUB_TOKEN }}" \
424424
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
425+
#-AL- for testing, remove later.
426+
- name: Show vcpkg NuGet
427+
shell: pwsh
428+
run: |
429+
vcpkg fetch nuget
425430
- name: Build C++
426431
shell: cmd
427432
run: |
433+
$env:VCPKG_DEBUG = "1"
428434
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
435+
vcpkg install abseil --debug
429436
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
430437
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
431438
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"

0 commit comments

Comments
 (0)