Skip to content

Commit b904bf5

Browse files
Update version to 0.36.0 against TileDB 2.28.0 (#389)
* Update version to 0.36.0 against TileDB 2.28.0 * fix hash * Apply suggestions from code review Co-authored-by: Philipp Winter <phw@nymity.ch> --------- Co-authored-by: Philipp Winter <phw@nymity.ch>
1 parent 5f28bd6 commit b904bf5

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.github/workflows/stable.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
env:
2626
OWNER_TILEDB_MARIADB: ${{ github.repository_owner }} # support building from a fork
2727
REF_MARIADB: mariadb-11.0.2
28-
REF_LIBTILEDB: 2.27.0
28+
REF_LIBTILEDB: 2.28.0
2929
REF_TILEDB_MARIADB: ${{ github.sha }}
3030
TILEDB_FORCE_ALL_DEPS: OFF
3131
steps:

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ if(NOT TileDB_FOUND AND SUPERBUILD)
5151
include(ExternalProject)
5252

5353
SET(TILEDB_VERSION_MAJOR "2")
54-
SET(TILEDB_VERSION_MINOR "27")
54+
SET(TILEDB_VERSION_MINOR "28")
5555
SET(TILEDB_VERSION_PATCH "0")
5656
SET(TILEDB_VERSION "${TILEDB_VERSION_MAJOR}.${TILEDB_VERSION_MINOR}.${TILEDB_VERSION_PATCH}")
5757

5858
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=non-virtual-dtor -Wno-error=missing-braces")
5959
ExternalProject_Add(tiledb
6060
PREFIX "externals"
6161
URL "https://github.com/TileDB-Inc/TileDB/archive/${TILEDB_VERSION}.zip"
62-
URL_HASH SHA1=d18d7c7600e290300010c057f8dafa9721a6ffa2
62+
URL_HASH SHA1=ec633e4440ff7d16f2668e37f24e80e3b7d168cd
6363
DOWNLOAD_NAME "tiledb.zip"
6464
CMAKE_ARGS
6565
-DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}

docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ WORKDIR /tmp
5555

5656
ENV MARIADB_VERSION="mariadb-11.0.2"
5757

58-
ARG MYTILE_VERSION="0.35.0"
58+
ARG MYTILE_VERSION="0.36.0"
5959

60-
ARG TILEDB_VERSION="2.27.0"
61-
ARG TILEDB_VERSION_SHORT_SHA="2862c30"
60+
ARG TILEDB_VERSION="2.28.0"
61+
ARG TILEDB_VERSION_SHORT_SHA="4764907"
6262
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"
6363

6464
# Download mytile release

docker/Dockerfile-R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ WORKDIR /tmp
7272

7373
ENV MARIADB_VERSION="mariadb-11.0.2"
7474

75-
ARG MYTILE_VERSION="0.35.0"
75+
ARG MYTILE_VERSION="0.36.0"
7676

77-
ARG TILEDB_VERSION="2.27.0"
78-
ARG TILEDB_VERSION_SHORT_SHA="2862c30"
77+
ARG TILEDB_VERSION="2.28.0"
78+
ARG TILEDB_VERSION_SHORT_SHA="4764907"
7979
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"
8080

8181
# Download mytile release

docker/Dockerfile-min

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ ENV MTR_MEM=/tmp \
5353
MARIADB_VERSION="mariadb-11.0.2"
5454
WORKDIR /tmp
5555

56-
ARG MYTILE_VERSION="0.35.0"
56+
ARG MYTILE_VERSION="0.36.0"
5757

58-
ARG TILEDB_VERSION="2.27.0"
59-
ARG TILEDB_VERSION_SHORT_SHA="2862c30"
58+
ARG TILEDB_VERSION="2.28.0"
59+
ARG TILEDB_VERSION_SHORT_SHA="4764907"
6060
ARG TILEDB_PREBUILT_FILE="tiledb-linux-x86_64-${TILEDB_VERSION}-${TILEDB_VERSION_SHORT_SHA}.tar.gz"
6161

6262
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added

mytile/ha_mytile.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4378,7 +4378,7 @@ mysql_declare_plugin(mytile){
43784378
PLUGIN_LICENSE_PROPRIETARY, /* the plugin license (PLUGIN_LICENSE_XXX) */
43794379
mytile_init_func, /* Plugin Init */
43804380
NULL, /* Plugin Deinit */
4381-
0x0350, /* version number (0.35.0) */
4381+
0x0360, /* version number (0.36.0) */
43824382
tile::statusvars::mytile_status_variables, /* status variables */
43834383
tile::sysvars::mytile_system_variables, /* system variables */
43844384
NULL, /* config options */
@@ -4395,9 +4395,9 @@ maria_declare_plugin(mytile){
43954395
PLUGIN_LICENSE_PROPRIETARY, /* the plugin license (PLUGIN_LICENSE_XXX) */
43964396
mytile_init_func, /* Plugin Init */
43974397
NULL, /* Plugin Deinit */
4398-
0x0350, /* version number (0.35.0) */
4398+
0x0360, /* version number (0.36.0) */
43994399
tile::statusvars::mytile_status_variables, /* status variables */
44004400
tile::sysvars::mytile_system_variables, /* system variables */
4401-
"0.35.0", /* string version */
4401+
"0.36.0", /* string version */
44024402
MariaDB_PLUGIN_MATURITY_BETA /* maturity */
44034403
} maria_declare_plugin_end;

0 commit comments

Comments
 (0)