Skip to content

Commit

Permalink
update to TileDB-2.21.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DimitrisStaratzis committed Mar 21, 2024
1 parent 073a80c commit f442473
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stable.yaml
Expand Up @@ -25,7 +25,7 @@ jobs:
env:
OWNER_TILEDB_MARIADB: ${{ github.repository_owner }} # support building from a fork
REF_MARIADB: mariadb-11.0.2
REF_LIBTILEDB: 2.20.1
REF_LIBTILEDB: 2.21.0
REF_TILEDB_MARIADB: ${{ github.sha }}
TILEDB_FORCE_ALL_DEPS: OFF
steps:
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -51,15 +51,15 @@ if(NOT TileDB_FOUND AND SUPERBUILD)
include(ExternalProject)

SET(TILEDB_VERSION_MAJOR "2")
SET(TILEDB_VERSION_MINOR "20")
SET(TILEDB_VERSION_PATCH "1")
SET(TILEDB_VERSION_MINOR "21")
SET(TILEDB_VERSION_PATCH "0")
SET(TILEDB_VERSION "${TILEDB_VERSION_MAJOR}.${TILEDB_VERSION_MINOR}.${TILEDB_VERSION_PATCH}")

SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=non-virtual-dtor -Wno-error=missing-braces")
ExternalProject_Add(tiledb
PREFIX "externals"
URL "https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.zip"
URL_HASH SHA1=10921fb7317e718e9bb6c88d6d410eac2ab49e10
URL_HASH SHA1=9bae46f598dd895268ec8ff38ddf6106c9895d07
DOWNLOAD_NAME "tiledb.zip"
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Expand Up @@ -55,10 +55,10 @@ WORKDIR /tmp

ENV MARIADB_VERSION="mariadb-11.0.2"

ARG MYTILE_VERSION="0.28.0"
ARG MYTILE_VERSION="0.29.0"

ARG TILEDB_VERSION="2.20.1"
ARG TILEDB_VERSION_SHORT_SHA="249c024"
ARG TILEDB_VERSION="2.21.0"
ARG TILEDB_VERSION_SHORT_SHA="0ea9c13"
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"

# Download mytile release
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile-R
Expand Up @@ -72,10 +72,10 @@ WORKDIR /tmp

ENV MARIADB_VERSION="mariadb-11.0.2"

ARG MYTILE_VERSION="0.28.0"
ARG MYTILE_VERSION="0.29.0"

ARG TILEDB_VERSION="2.20.1"
ARG TILEDB_VERSION_SHORT_SHA="249c024"
ARG TILEDB_VERSION="2.21.0"
ARG TILEDB_VERSION_SHORT_SHA="0ea9c13"
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"

# Download mytile release
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile-dev
Expand Up @@ -51,8 +51,8 @@ RUN apt-get update && apt-get install -y \

ENV MTR_MEM /tmp

ARG TILEDB_VERSION="2.20.1"
ARG TILEDB_VERSION_SHORT_SHA="249c024"
ARG TILEDB_VERSION="2.21.0"
ARG TILEDB_VERSION_SHORT_SHA="0ea9c13"
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"

WORKDIR /tmp
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile-min
Expand Up @@ -53,10 +53,10 @@ ENV MTR_MEM=/tmp \
MARIADB_VERSION="mariadb-11.0.2"
WORKDIR /tmp

ARG MYTILE_VERSION="0.28.0"
ARG MYTILE_VERSION="0.29.0"

ARG TILEDB_VERSION="2.20.1"
ARG TILEDB_VERSION_SHORT_SHA="249c024"
ARG TILEDB_VERSION="2.21.0"
ARG TILEDB_VERSION_SHORT_SHA="0ea9c13"
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"

# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile-server
Expand Up @@ -54,10 +54,10 @@ WORKDIR /tmp

ENV MARIADB_VERSION="mariadb-11.0.2"

ARG MYTILE_VERSION="0.28.0"
ARG MYTILE_VERSION="0.29.0"

ARG TILEDB_VERSION="2.20.1"
ARG TILEDB_VERSION_SHORT_SHA="249c024"
ARG TILEDB_VERSION="2.21.0"
ARG TILEDB_VERSION_SHORT_SHA="0ea9c13"
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"

# Download mytile release
Expand Down
6 changes: 3 additions & 3 deletions mytile/ha_mytile.cc
Expand Up @@ -3756,7 +3756,7 @@ mysql_declare_plugin(mytile){
PLUGIN_LICENSE_PROPRIETARY, /* the plugin license (PLUGIN_LICENSE_XXX) */
mytile_init_func, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0280, /* version number (0.28.0) */
0x0290, /* version number (0.29.0) */
tile::statusvars::mytile_status_variables, /* status variables */
tile::sysvars::mytile_system_variables, /* system variables */
NULL, /* config options */
Expand All @@ -3773,9 +3773,9 @@ maria_declare_plugin(mytile){
PLUGIN_LICENSE_PROPRIETARY, /* the plugin license (PLUGIN_LICENSE_XXX) */
mytile_init_func, /* Plugin Init */
NULL, /* Plugin Deinit */
0x0280, /* version number (0.28.0) */
0x0290, /* version number (0.29.0) */
tile::statusvars::mytile_status_variables, /* status variables */
tile::sysvars::mytile_system_variables, /* system variables */
"0.28.0", /* string version */
"0.29.0", /* string version */
MariaDB_PLUGIN_MATURITY_BETA /* maturity */
} maria_declare_plugin_end;

0 comments on commit f442473

Please sign in to comment.