Merge pull request #828 from Bit-Quill/dev-fix-odbc-build

Fix failing ODBC workflow
opensearch-project · Sep 13, 2022 · ffb3ce7 · ffb3ce7
2 parents a4a37f3 + f4b1f66
commit ffb3ce7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/sql-odbc/scripts/build_libcurl-vcpkg.ps1 b/sql-odbc/scripts/build_libcurl-vcpkg.ps1
diff --git a/sql-odbc/scripts/build_windows.ps1 b/sql-odbc/scripts/build_windows.ps1
@@ -21,9 +21,8 @@ $BUILD_DIR = "${WORKING_DIR}\build"
 # $BUILD_DIR = "${WORKING_DIR}\build\${CONFIGURATION}${BITNESS}"
 New-Item -Path $BUILD_DIR -ItemType Directory -Force | Out-Null
 
-$VCPKG_DIR = "${WORKING_DIR}/src/vcpkg"
-
-.\scripts\build_libcurl-vcpkg.ps1 $VCPKG_DIR $LIBCURL_WIN_ARCH
+$VCPKG_DIR = $Env:VCPKG_ROOT
+vcpkg.exe install curl[tool]:${LIBCURL_WIN_ARCH}-windows
 
 Set-Location $CURRENT_DIR