Skip to content

Commit

Permalink
Use TileDB 2.18.1 (#621)
Browse files Browse the repository at this point in the history
* Use TileDB 2.18.1

* Two minor tweaks to r-ci.sh, extra system logging on macOS

* Skip test_arrayschemaevolution_arrow.R on macOS

* Skip test_arrayschemaevolution.R on macOS

* Revert test skip on macOS as it really is a cpu issue

* Update NEWS.md [ci skip]
  • Loading branch information
eddelbuettel authored Nov 28, 2023
1 parent 8ccc4cb commit 8583603
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/r-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -e

CRAN=${CRAN:-"https://cloud.r-project.org"}
OS=$(uname -s)
RVER=${RVER:-"4.3.0"}
RVER=${RVER:-"4.3.2"}

## Optional drat repos, unset by default
DRAT_REPOS=${DRAT_REPOS:-""}
Expand Down Expand Up @@ -202,7 +202,7 @@ BootstrapLinuxOptions() {

BootstrapMac() {
# Install from latest CRAN binary build for OS X
wget ${CRAN}/bin/macosx/big-sur-x86_64/base/R-${RVER}-x86_64.pkg -O /tmp/R-latest.pkg
wget -q ${CRAN}/bin/macosx/big-sur-x86_64/base/R-${RVER}-x86_64.pkg -O /tmp/R-latest.pkg

echo "Installing OS X binary package for R"
sudo installer -pkg /tmp/R-latest.pkg -target /
Expand Down Expand Up @@ -383,7 +383,9 @@ RunTests() {
if [[ "$_R_CHECK_CRAN_INCOMING_" == "FALSE" ]]; then
echo "(CRAN incoming checks are off)"
fi
_R_CHECK_CRAN_INCOMING_=${_R_CHECK_CRAN_INCOMING_} R CMD check "${FILE}" ${R_CHECK_ARGS} ${R_CHECK_INSTALL_ARGS}
_R_CHECK_TESTS_NLINES_=${_R_CHECK_TESTS_NLINES_} \
_R_CHECK_CRAN_INCOMING_=${_R_CHECK_CRAN_INCOMING_} \
R CMD check "${FILE}" ${R_CHECK_ARGS} ${R_CHECK_INSTALL_ARGS}

if [[ -n "${WARNINGS_ARE_ERRORS}" ]]; then
if DumpLogsByExtension "00check.log" | grep -q WARNING; then
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: System
run: sysctl -a
if: ${{ matrix.os == 'macOS-latest' }}

- name: Bootstrap
run: ./.github/r-ci.sh bootstrap

Expand Down
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# ongoing development

* This release of the R package builds against [TileDB 2.18.0](https://github.com/TileDB-Inc/TileDB/releases/tag/2.18.0) and [TileDB 2.18.1](https://github.com/TileDB-Inc/TileDB/releases/tag/2.18.1), , and has also been tested against earlier releases as well as the development version (#620,#621)

## Improvements

* Use of TileDB Embedded was upgraded to release 2.18.0 (#620) and 2.18.1 (#621)

## Bug Fixes

* When using serializing via VFS (as added in #608) the filehandles is now properly released (#619)
Expand Down
4 changes: 2 additions & 2 deletions tools/tiledbVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version: 2.18.0
sha: 71ca8b4
version: 2.18.1
sha: fe4544c

0 comments on commit 8583603

Please sign in to comment.