Skip to content

Commit cff8080

Browse files
committed
Enable CI/CD tests
1 parent 51723fd commit cff8080

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

.github/workflows/build-wheels.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ jobs:
4949
CIBW_ARCHS: all
5050
CIBW_PRERELEASE_PYTHONS: True
5151
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
52+
CIBW_TEST_REQUIRES: pytest
53+
# This command should be just `pytest`, however, our tests require test data and those are only in the
54+
# original {project} folder. The cibuildwheel logic unfortunately creates an empty folder for tests, changes
55+
# directory there and so our tests will search for data folder in a completely different working directory.
56+
CIBW_TEST_COMMAND: "pytest"
57+
CIBW_ENVIRONMENT: TILEDB_REST_TOKEN=${{ secrets.TILEDB_CLOUD_HELPER_VAR }}
58+
SYSTEM_VERSION_COMPAT: ${{ startsWith(matrix.os, 'macos-') }}
5259
with:
5360
output-dir: wheelhouse
5461

tiledb/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ install(TARGETS main libtiledb DESTINATION tiledb)
6161
if(TILEDB_DOWNLOADED)
6262
message(STATUS "Adding libtiledb.so into install group")
6363

64-
install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb/lib)
64+
install(IMPORTED_RUNTIME_ARTIFACTS TileDB::tiledb_shared DESTINATION tiledb)
6565

6666
if (APPLE)
67-
set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path/lib")
68-
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "@loader_path/lib")
67+
set_target_properties(main PROPERTIES INSTALL_RPATH "@loader_path")
68+
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "@loader_path")
6969
elseif(UNIX)
70-
set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
71-
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
70+
set_target_properties(main PROPERTIES INSTALL_RPATH "\$ORIGIN")
71+
set_target_properties(libtiledb PROPERTIES INSTALL_RPATH "\$ORIGIN")
7272
endif()
7373
endif()
7474

tiledb/cc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ install(TARGETS cc DESTINATION tiledb)
3737

3838
if(TILEDB_DOWNLOADED)
3939
if (APPLE)
40-
set_target_properties(cc PROPERTIES INSTALL_RPATH "@loader_path/lib")
40+
set_target_properties(cc PROPERTIES INSTALL_RPATH "@loader_path")
4141
elseif(UNIX)
42-
set_target_properties(cc PROPERTIES INSTALL_RPATH "\$ORIGIN/lib")
42+
set_target_properties(cc PROPERTIES INSTALL_RPATH "\$ORIGIN")
4343
endif()
4444
endif()

0 commit comments

Comments
 (0)