Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use TileDB 2.15.2 #541

Merged
merged 5 commits into from
Apr 26, 2023
Merged

Use TileDB 2.15.2 #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36c3b6d
Use TileDB 2.15.2
eddelbuettel Apr 26, 2023
2bdf63a
Repair macOS CI after link change and R 4.3.0 release
eddelbuettel Apr 26, 2023
3d935da
Simplify windows matrix and removing devel-ucrt
eddelbuettel Apr 26, 2023
d88ffe8
Use windows-latest for release and devel
eddelbuettel Apr 26, 2023
2eca67c
Update NEWS.md [ci skip]
eddelbuettel Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/r-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ set -e

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

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

BootstrapMac() {
# Install from latest CRAN binary build for OS X
wget ${CRAN}/bin/macosx/R-latest.pkg -O /tmp/R-latest.pkg
wget ${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 /
rm "/tmp/R-latest.pkg"
sudo installer -pkg /tmp/R-latest.pkg -target /
rm /tmp/R-latest.pkg

# Process options
BootstrapMacOptions
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ jobs:
fail-fast: false
matrix:
include: [
{ windows: windows-2019, r: release },
{ windows: windows-2022, r: devel },
{ windows: windows-2022, r: devel-ucrt }
{ windows: windows-latest, r: release },
{ windows: windows-latest, r: devel }
]
steps:
- run: git config --global core.autocrlf false
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

* The startup message now displays the operating system and version (#532)

* Use of TileDB Embedded was upgraded to release 2.15.1 (#534)
* Use of TileDB Embedded was upgraded to release 2.15.1 and 2.15.2 (#534, #541)

* Group objects can be opened while supplying a Config object when 2.15.1 or newer is used (#535, #536)

Expand Down
4 changes: 2 additions & 2 deletions tools/tiledbVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version: 2.15.1
sha: 432d4c2
version: 2.15.2
sha: 90f30eb