Skip to content

Commit 2aa2e69

Browse files
authored
fix(ci): Fix verification workflow (#552)
There are a few problems in the verification workflow: - On Windows, we weren't exporting any symbols in the C data integration test (when building with CMake) - The R package testthat doesn't seem to support centos7, which we would need to test the R package there - The R package jsonlite seems to leak memory. One fix is jeroen/jsonlite#442 , but in the meantime we can ignore the leak since it doesn't come from us.
1 parent e19c17f commit 2aa2e69

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.github/workflows/verify.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ jobs:
134134
platform: "centos7",
135135
arch: "amd64",
136136
# Currently the Python on the centos7 image is 3.6, which does not support
137-
# new enough setuptools to build the Python package.
138-
compose_args: "-e NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR=1 -e TEST_PYTHON=0"
137+
# new enough setuptools to build the Python package. Our test dependencies
138+
# no longer support centos7 for R, either.
139+
compose_args: "-e NANOARROW_ACCEPT_IMPORT_GPG_KEYS_ERROR=1 -e TEST_PYTHON=0 -e TEST_R=0"
139140
}
140141
- {
141142
platform: "ubuntu",

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ if(NANOARROW_BUILD_TESTS OR NANOARROW_BUILD_INTEGRATION_TESTS)
314314
set_target_properties(nanoarrow PROPERTIES POSITION_INDEPENDENT_CODE ON)
315315
add_library(nanoarrow_c_data_integration SHARED
316316
src/nanoarrow/integration/c_data_integration.cc)
317+
target_compile_definitions(nanoarrow_c_data_integration PRIVATE NANOARROW_BUILD_DLL
318+
NANOARROW_EXPORT_DLL)
317319
target_include_directories(nanoarrow_c_data_integration
318320
PUBLIC $<BUILD_INTERFACE:${NANOARROW_BUILD_INCLUDE_DIR}>
319321
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>

valgrind.supp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,12 @@
5757
fun:malloc
5858
fun:_PyObject_GC_NewVar
5959
}
60+
61+
# Can be removed when https://github.com/jeroen/jsonlite/pull/442 is released
62+
{
63+
<jsonlite>:Leak in base64_encode
64+
Memcheck:Leak
65+
...
66+
fun:base64_encode
67+
fun:R_base64_encode
68+
}

0 commit comments

Comments
 (0)