Skip to content

Commit 6f7399c

Browse files
committed
Run vcpkg install after vcpkg is set in GLib
1 parent c6d1f39 commit 6f7399c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,14 @@ jobs:
425425
run: |
426426
vcpkg fetch nuget
427427
# -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-
# bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
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"
435436
# - name: Register Flight SQL ODBC Driver
436437
# shell: cmd
437438
# run: |

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ jobs:
432432
run: |
433433
$env:VCPKG_DEBUG = "1"
434434
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
435-
vcpkg install abseil --debug
436435
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
437436
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
437+
vcpkg install abseil --debug
438438
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
439439
- name: Build GLib
440440
shell: cmd

0 commit comments

Comments
 (0)