Re-enable continuous integration

(plus minor cleanup following rebase)
TileDB-Inc · Aug 14, 2023 · 3aae654 · 3aae654
1 parent 796d7e4
commit 3aae654
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflowsDISABLED/ci.yaml → .github/workflows/ci.yaml b/.github/workflowsDISABLED/ci.yaml → .github/workflows/ci.yaml
diff --git a/.github/workflowsDISABLED/valgrind.yaml → .github/workflows/valgrind.yaml b/.github/workflowsDISABLED/valgrind.yaml → .github/workflows/valgrind.yaml
diff --git a/.github/workflowsDISABLED/windows.yaml → .github/workflows/windows.yaml b/.github/workflowsDISABLED/windows.yaml → .github/workflows/windows.yaml
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -428,6 +428,7 @@ libtiledb_array_schema_check <- function(schema) {
 
 libtiledb_array_schema_version <- function(schema) {
     .Call(`_tiledb_libtiledb_array_schema_version`, schema)
+}
 
 libtiledb_array_schema_set_enumeration <- function(ctx, schema, attr, enum_name, values, nullable = FALSE, ordered = FALSE) {
     .Call(`_tiledb_libtiledb_array_schema_set_enumeration`, ctx, schema, attr, enum_name, values, nullable, ordered)
@@ -1140,3 +1141,4 @@ querybuf_from_shmem <- function(path, dtype) {
 vlcbuf_from_shmem <- function(datapath, dtype) {
     .Call(`_tiledb_vlcbuf_from_shmem`, datapath, dtype)
 }
+
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -1220,6 +1220,7 @@ BEGIN_RCPP
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< XPtr<tiledb::ArraySchema> >::type schema(schemaSEXP);
     rcpp_result_gen = Rcpp::wrap(libtiledb_array_schema_version(schema));
+    return rcpp_result_gen;
 END_RCPP
 }
 // libtiledb_array_schema_set_enumeration
@@ -3483,11 +3484,8 @@ static const R_CallMethodDef CallEntries[] = {
     {"_tiledb_libtiledb_array_schema_sparse", (DL_FUNC) &_tiledb_libtiledb_array_schema_sparse, 1},
     {"_tiledb_libtiledb_array_schema_dump", (DL_FUNC) &_tiledb_libtiledb_array_schema_dump, 1},
     {"_tiledb_libtiledb_array_schema_check", (DL_FUNC) &_tiledb_libtiledb_array_schema_check, 1},
-<<<<<<< HEAD
     {"_tiledb_libtiledb_array_schema_version", (DL_FUNC) &_tiledb_libtiledb_array_schema_version, 1},
-=======
     {"_tiledb_libtiledb_array_schema_set_enumeration", (DL_FUNC) &_tiledb_libtiledb_array_schema_set_enumeration, 7},
->>>>>>> d9969d36 (Snapshot with updated enumeration class)
     {"_tiledb_libtiledb_array_schema_evolution", (DL_FUNC) &_tiledb_libtiledb_array_schema_evolution, 1},
     {"_tiledb_libtiledb_array_schema_evolution_add_attribute", (DL_FUNC) &_tiledb_libtiledb_array_schema_evolution_add_attribute, 2},
     {"_tiledb_libtiledb_array_schema_evolution_drop_attribute", (DL_FUNC) &_tiledb_libtiledb_array_schema_evolution_drop_attribute, 2},