Skip to content

Enable S3 and Serialization for prebuilt jar #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 25, 2020
Merged

Enable S3 and Serialization for prebuilt jar #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0296c6
Add missing serialization cmake option
Shelnutt2 Aug 24, 2020
06bd61c
Enable S3 and Serialization for prebuilt jar
Shelnutt2 Aug 24, 2020
2be9990
Update S3 to default enablement in source builds
Shelnutt2 Aug 24, 2020
daddb86
Run CI without S3/Serialization to speedup CI
Shelnutt2 Aug 25, 2020
2f63ae1
Bump version to 0.3.2-SNAPSHOT
Shelnutt2 Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Don't use GNU extensions
option(TILEDB_VERBOSE "Prints TileDB errors with verbosity" OFF)
option(TILEDB_S3 "Enables S3 support using aws-cpp-sdk" OFF)
option(TILEDB_HDFS "Enables HDFS support using the official Hadoop JNI bindings" OFF)
option(TILEDB_SERIALIZATION "Enables TileDB Cloud support" OFF)

############################################################
# Superbuild setup
Expand Down
16 changes: 14 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ stages:
matrix:
VS2019:
imageName: 'windows-2019'
TILEDB_S3: ON
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF"
ORG_GRADLE_PROJECT_TILEDB_S3: "OFF"
pool:
vmImage: $(imageName)
steps:
Expand All @@ -39,8 +40,12 @@ stages:
matrix:
ubuntu_18:
imageName: 'ubuntu-18.04'
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF"
ORG_GRADLE_PROJECT_TILEDB_S3: "OFF"
macOS:
imageName: 'macOS-10.14'
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "OFF"
ORG_GRADLE_PROJECT_TILEDB_S3: "OFF"
pool:
vmImage: $(imageName)
steps:
Expand All @@ -54,8 +59,12 @@ stages:
matrix:
ubuntu_18:
imageName: 'ubuntu-18.04'
ORG_GRADLE_PROJECT_TILEDB_S3: "ON"
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON"
macOS:
imageName: 'macOS-10.14'
ORG_GRADLE_PROJECT_TILEDB_S3: "ON"
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON"
pool:
vmImage: $(imageName)
steps:
Expand All @@ -65,6 +74,7 @@ stages:
matrix:
windows_19:
imageName: 'windows-2019'
ORG_GRADLE_PROJECT_TILEDB_S3: "ON"
pool:
vmImage: $(imageName)
steps:
Expand All @@ -78,6 +88,8 @@ stages:
matrix:
ubuntu_18:
imageName: 'ubuntu-18.04'
ORG_GRADLE_PROJECT_TILEDB_S3: "ON"
ORG_GRADLE_PROJECT_TILEDB_SERIALIZATION: "ON"
pool:
vmImage: $(imageName)

Expand Down Expand Up @@ -141,4 +153,4 @@ stages:
pool:
vmImage: $(imageName)
steps:
- template: ci/tiledb-java-final-jar.yml
- template: ci/tiledb-java-final-jar.yml
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group 'io.tiledb'
version '0.3.1-SNAPSHOT'
version '0.3.2-SNAPSHOT'

repositories {
jcenter()
Expand Down
1 change: 1 addition & 0 deletions cmake/Modules/FindTileDB_EP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ if (NOT TILEDB_FOUND)
-DTILEDB_VERBOSE=${TILEDB_VERBOSE}
-DTILEDB_S3=${TILEDB_S3}
-DTILEDB_HDFS=${TILEDB_HDFS}
-DTILEDB_SERIALIZATION=${TILEDB_SERIALIZATION}
-DTILEDB_FORCE_ALL_DEPS=ON
UPDATE_COMMAND ""
INSTALL_COMMAND
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
TILEDB_GIT_TAG=2.0.3
TILEDB_VERBOSE=OFF
TILEDB_S3=OFF
TILEDB_S3=ON
TILEDB_HDFS=OFF
TILEDB_SERIALIZATION=OFF