From e952a9b4f955f81642efe4360687a307a79602f7 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Wed, 8 Jan 2025 13:58:36 -0500 Subject: [PATCH] Fix nightly build by updating branch name from "dev" to "main" (#797) * Fix nightly build by updating branch name from "dev" to "main" * Update a few more instances of TileDB "dev" branch in source files --- tools/ci/valgrind/buildTileDB.sh | 2 +- tools/fetchTileDBSrc.R | 4 ++-- vignettes/introduction.Rmd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/ci/valgrind/buildTileDB.sh b/tools/ci/valgrind/buildTileDB.sh index 4cf16acfb4..9e3d7605db 100755 --- a/tools/ci/valgrind/buildTileDB.sh +++ b/tools/ci/valgrind/buildTileDB.sh @@ -20,7 +20,7 @@ echo "::group::Setup sources" if [ ${isrelease} -eq 0 ]; then git clone --single-branch --branch ${version} https://github.com/TileDB-Inc/TileDB.git TileDB-${version} git log --graph --pretty=format:'%h - %d %s (%cr) <%an>' --abbrev-commit | head -elif [ ${version} = "dev" ]; then +elif [ ${version} = "main" ]; then wget https://github.com/TileDB-Inc/TileDB/archive/refs/heads/${version}.zip unzip ${version}.zip rm ${version}.zip diff --git a/tools/fetchTileDBSrc.R b/tools/fetchTileDBSrc.R index 9872055c96..b201e7c82d 100755 --- a/tools/fetchTileDBSrc.R +++ b/tools/fetchTileDBSrc.R @@ -43,9 +43,9 @@ if (!file.exists("tiledb.tar.gz")) { cat("Converting zip to tar.gz ...\n") unzip("tiledb.tar.gz") unlink("tiledb.tar.gz") - Sys.chmod("TileDB-dev/bootstrap", mode="0755") + Sys.chmod("TileDB-main/bootstrap", mode="0755") options(warn=-1) - tar("tiledb.tar.gz", "TileDB-dev", compression="gzip") + tar("tiledb.tar.gz", "TileDB-main", compression="gzip") } options(op) diff --git a/vignettes/introduction.Rmd b/vignettes/introduction.Rmd index cfb9fbaa2a..23d84d80eb 100644 --- a/vignettes/introduction.Rmd +++ b/vignettes/introduction.Rmd @@ -182,7 +182,7 @@ column *reduces to a vector* as this happens at the R side: Basic reading returns the coordinates and any attributes. The following examples use the array created by the -[quickstart_sparse](https://github.com/TileDB-Inc/TileDB/blob/dev/examples/cpp_api/quickstart_sparse.cc) +[quickstart_sparse](https://github.com/TileDB-Inc/TileDB/blob/main/examples/cpp_api/quickstart_sparse.cc) example. ``` r