Skip to content

Commit 8675c9f

Browse files
committed
Comments
1 parent cf6406c commit 8675c9f

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ jobs:
5656
ref: ${{ inputs.libtiledb_ref }}
5757
path: _tiledb_core
5858

59+
- name: Clone vcpkg
60+
if: inputs.libtiledb_ref
61+
run: |
62+
git clone https://github.com/microsoft/vcpkg.git _vcpkg
63+
./_vcpkg/bootstrap-vcpkg.sh -disableMetrics
64+
5965
- name: Setup MSVC toolset (VS 2022)
6066
uses: TheMrMilchmann/setup-msvc-dev@v3
6167
if: startsWith(matrix.os, 'windows')
@@ -100,26 +106,21 @@ jobs:
100106
- name: "Build and Install TileDB Core"
101107
if: inputs.libtiledb_ref
102108
run: |
103-
# Configure with vcpkg on Windows, without on Unix
109+
# Configure with vcpkg on all platforms
104110
CMAKE_ARGS=(
105111
-S _tiledb_core
106112
-B _tiledb_core/build
107113
-DCMAKE_BUILD_TYPE=Release
108114
-DBUILD_SHARED_LIBS=ON
109115
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist"
110116
-DTILEDB_INSTALL_LIBDIR=lib
111-
-DTILEDB_S3=ON
112117
-DTILEDB_SERIALIZATION=ON
113118
-DTILEDB_TESTS=OFF
119+
-DCMAKE_TOOLCHAIN_FILE="${GITHUB_WORKSPACE//\\//}/_vcpkg/scripts/buildsystems/vcpkg.cmake"
114120
)
115121
116-
if [[ "${{ runner.os }}" == "Windows" ]]; then
117-
CMAKE_ARGS+=(-DCMAKE_TOOLCHAIN_FILE="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake")
118-
fi
119-
120122
cmake "${CMAKE_ARGS[@]}"
121-
cmake --build _tiledb_core/build --config Release -j4
122-
cmake --build _tiledb_core/build --config Release --target install
123+
cmake --build _tiledb_core/build --config Release -j4 --target install
123124
124125
- name: "Build and Install TileDB-Py"
125126
run: |

0 commit comments

Comments
 (0)