Skip to content

Commit 6efa7d4

Browse files
committed
Check nuget paths in Ruby Glib and ODBC
Run vcpkg install after vcpkg is set in GLib
1 parent 64db26d commit 6efa7d4

File tree

3 files changed

+32
-14
lines changed

3 files changed

+32
-14
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -420,22 +420,29 @@ jobs:
420420
$(vcpkg fetch nuget | tail -n 1) \
421421
setapikey "${{ secrets.GITHUB_TOKEN }}" \
422422
-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
423+
- name: Show vcpkg NuGet
424+
shell: pwsh
432425
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.
426+
vcpkg fetch nuget
427+
# -AL- temp disable.
428+
# - name: Build
429+
# shell: cmd
430+
# run: |
431+
# set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
432+
# call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
433+
# set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
434+
# vcpkg install abseil --debug
435+
# bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
436+
437+
# - name: Register Flight SQL ODBC Driver
438+
# shell: cmd
439+
# run: |
440+
# call "cpp\src\arrow\flight\sql\odbc\tests\install_odbc.cmd" ${{ github.workspace }}\build\cpp\%ARROW_BUILD_TYPE%\arrow_flight_sql_odbc.dll
441+
# # GH-48270 TODO: Resolve segementation fault during Arrow library unload
442+
# # GH-48269 TODO: Enable Flight & Flight SQL testing in MSVC CI
443+
# # GH-48547 TODO: enable ODBC tests after GH-48270 and GH-48269 are resolved.
437444

438-
# GH-47787 TODO: Build ODBC installer
445+
# # GH-47787 TODO: Build ODBC installer
439446

440447
report-extra-cpp:
441448
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,12 +422,19 @@ 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%
429435
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
430436
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
437+
vcpkg install abseil --debug
431438
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
432439
- name: Build GLib
433440
shell: cmd

ci/scripts/cpp_build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
set -ex
2121

22+
export VCPKG_DEBUG=1 #-AL- TEMP
23+
2224
source_dir=${1}/cpp
2325
build_dir=${2}/cpp
2426

@@ -180,7 +182,9 @@ elif [ -n "${CMAKE_PRESET}" ]; then
180182
${ARROW_CMAKE_ARGS} \
181183
${source_dir}
182184
else
185+
# -AL- added `VCPKG_VERBOSE` for debugging vcpkg
183186
cmake \
187+
-DVCPKG_VERBOSE=ON \
184188
-Dabsl_SOURCE=${absl_SOURCE:-} \
185189
-DARROW_ACERO=${ARROW_ACERO:-OFF} \
186190
-DARROW_AZURE=${ARROW_AZURE:-OFF} \

0 commit comments

Comments
 (0)