From e66faf12c79f897240cdb4b616aef113ca354cb2 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Wed, 11 Dec 2024 16:31:31 -0500 Subject: [PATCH] [c++] Use core 2.27.0 (#3421) --- .github/workflows/python-ci-packaging.yml | 12 ++++---- apis/r/tools/get_tarball.R | 6 ++-- .../cmake/Modules/FindTileDB_EP.cmake | 28 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/python-ci-packaging.yml b/.github/workflows/python-ci-packaging.yml index 64cff69e38..ebf3c9d9c3 100644 --- a/.github/workflows/python-ci-packaging.yml +++ b/.github/workflows/python-ci-packaging.yml @@ -76,7 +76,7 @@ jobs: run: | mkdir -p external # Please do not edit manually -- let scripts/update-tiledb-version.py update this - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-linux-x86_64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-linux-x86_64-2.27.0-2862c30.tar.gz tar -C external -xzf tiledb-linux-x86_64-*.tar.gz ls external/lib/ echo "LD_LIBRARY_PATH=$(pwd)/external/lib" >> $GITHUB_ENV @@ -178,10 +178,10 @@ jobs: mkdir -p external # Please do not edit manually -- let scripts/update-tiledb-version.py update this if [ `uname -m` == "arm64" ]; then - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-arm64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-arm64-2.27.0-2862c30.tar.gz tar -C external -xzf tiledb-macos-arm64-*.tar.gz else - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-x86_64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-x86_64-2.27.0-2862c30.tar.gz tar -C external -xzf tiledb-macos-x86_64-*.tar.gz fi ls external/lib/ @@ -274,14 +274,14 @@ jobs: if [ `uname -s` == "Darwin" ]; then if [ `uname -m` == "arm64" ]; then # Please do not edit manually -- let scripts/update-tiledb-version.py update this - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-arm64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-arm64-2.27.0-2862c30.tar.gz else # Please do not edit manually -- let scripts/update-tiledb-version.py update this - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-x86_64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-x86_64-2.27.0-2862c30.tar.gz fi else # Please do not edit manually -- let scripts/update-tiledb-version.py update this - wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-linux-x86_64-2.27.0.rc5-2862c30.tar.gz + wget --quiet https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-linux-x86_64-2.27.0-2862c30.tar.gz fi tar -C external -xzf tiledb-*.tar.gz ls external/lib/ diff --git a/apis/r/tools/get_tarball.R b/apis/r/tools/get_tarball.R index 7b29b5ac75..0e3b6ed1cd 100644 --- a/apis/r/tools/get_tarball.R +++ b/apis/r/tools/get_tarball.R @@ -14,14 +14,14 @@ isLinux <- Sys.info()["sysname"] == "Linux" if (isMac) { arch <- system('uname -m', intern = TRUE) if (arch == "x86_64") { - url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-x86_64-2.27.0.rc5-2862c30.tar.gz" + url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-x86_64-2.27.0-2862c30.tar.gz" } else if (arch == "arm64") { - url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-arm64-2.27.0.rc5-2862c30.tar.gz" + url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-arm64-2.27.0-2862c30.tar.gz" } else { stop("Unsupported Mac architecture. Please have TileDB Core installed locally.") } } else if (isLinux) { - url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-linux-x86_64-2.27.0.rc5-2862c30.tar.gz" + url <- "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-linux-x86_64-2.27.0-2862c30.tar.gz" } else { message("Unsupported platform for downloading artifacts. Please have TileDB Core installed locally.") q(save = "no", status = 1) diff --git a/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake b/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake index 07f8515f64..7bc481c6fa 100644 --- a/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake +++ b/libtiledbsoma/cmake/Modules/FindTileDB_EP.cmake @@ -58,8 +58,8 @@ else() # NB When updating the pinned URLs here, please also update in file apis/r/tools/get_tarball.R if(DOWNLOAD_TILEDB_PREBUILT) if (WIN32) # Windows - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-windows-x86_64-2.27.0.rc5-2862c30.zip") - SET(DOWNLOAD_SHA1 "c23d84a55dac572c767d461e7b2a697edce88512") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-windows-x86_64-2.27.0-2862c30.zip") + SET(DOWNLOAD_SHA1 "fff5b9dda8b6d9fcd09210ebf286f0e076af1263") elseif(APPLE) # OSX # Status quo as of 2023-05-18: @@ -76,22 +76,22 @@ else() # o CMAKE_SYSTEM_PROCESSOR is x86_64 if (CMAKE_OSX_ARCHITECTURES STREQUAL x86_64) - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-x86_64-2.27.0.rc5-2862c30.tar.gz") - SET(DOWNLOAD_SHA1 "586020a2ee2c93eda3013cad17b4dd20e6b0b8be") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-x86_64-2.27.0-2862c30.tar.gz") + SET(DOWNLOAD_SHA1 "d03aefe7d444dba8f3eecfc80e0f73286b38bf8c") elseif (CMAKE_OSX_ARCHITECTURES STREQUAL arm64) - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-arm64-2.27.0.rc5-2862c30.tar.gz") - SET(DOWNLOAD_SHA1 "ebcf68fbd5ba6369123d5cc4adaa37aec9440768") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-arm64-2.27.0-2862c30.tar.gz") + SET(DOWNLOAD_SHA1 "af8251851951efc0edb084500a4b27e425719876") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-x86_64-2.27.0.rc5-2862c30.tar.gz") - SET(DOWNLOAD_SHA1 "586020a2ee2c93eda3013cad17b4dd20e6b0b8be") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-x86_64-2.27.0-2862c30.tar.gz") + SET(DOWNLOAD_SHA1 "d03aefe7d444dba8f3eecfc80e0f73286b38bf8c") elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-macos-arm64-2.27.0.rc5-2862c30.tar.gz") - SET(DOWNLOAD_SHA1 "ebcf68fbd5ba6369123d5cc4adaa37aec9440768") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-macos-arm64-2.27.0-2862c30.tar.gz") + SET(DOWNLOAD_SHA1 "af8251851951efc0edb084500a4b27e425719876") endif() else() # Linux - SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0.rc5/tiledb-linux-x86_64-2.27.0.rc5-2862c30.tar.gz") - SET(DOWNLOAD_SHA1 "9c1b1810cedd18bf30d9470d4569c9273e7f0dc3") + SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.27.0/tiledb-linux-x86_64-2.27.0-2862c30.tar.gz") + SET(DOWNLOAD_SHA1 "4407506d36f85aede71cdba875729a1442f5fa73") endif() ExternalProject_Add(ep_tiledb @@ -113,8 +113,8 @@ else() else() # Build from source ExternalProject_Add(ep_tiledb PREFIX "externals" - URL "https://github.com/TileDB-Inc/TileDB/archive/2.27.0.rc5.zip" - URL_HASH SHA1=a7fae38918f268e6efbcc688d51800b93cfe3f5d + URL "https://github.com/TileDB-Inc/TileDB/archive/2.27.0.zip" + URL_HASH SHA1=d18d7c7600e290300010c057f8dafa9721a6ffa2 DOWNLOAD_NAME "tiledb.zip" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EP_INSTALL_PREFIX}