diff --git a/docker/Dockerfile-R b/docker/Dockerfile-R index b5d129b8..6f4be950 100644 --- a/docker/Dockerfile-R +++ b/docker/Dockerfile-R @@ -72,7 +72,7 @@ WORKDIR /tmp ENV MARIADB_VERSION="mariadb-11.0.2" -ARG MYTILE_VERSION="0.35.0. +ARG MYTILE_VERSION="0.35.0" ARG TILEDB_VERSION="2.27.0" ARG TILEDB_VERSION_SHORT_SHA="2862c30" diff --git a/scripts/ci/build-tiledb-mariadb.sh b/scripts/ci/build-tiledb-mariadb.sh index f9c7fd99..7c855fcb 100644 --- a/scripts/ci/build-tiledb-mariadb.sh +++ b/scripts/ci/build-tiledb-mariadb.sh @@ -16,7 +16,7 @@ then elif [[ "$OS" == "Darwin" ]] then FLAGS_NEEDED="-Wno-overloaded-virtual -Wno-error=deprecated-non-prototype -Wno-error=inconsistent-missing-override -Wno-error=enum-conversion -Wno-error=deprecated-declarations -Wno-error=incompatible-pointer-types-discards-qualifiers -Wno-error=incompatible-function-pointer-types -Wno-error=writable-strings -Wno-writable-strings -Wno-write-strings -Wno-error -Wno-error=pointer-sign -Wno-error=all -Wno-error=unknown-warning-option -Wno-error=unused-but-set-variable -Wno-error=deprecated-copy-with-user-provided-copy" - export PATH="$(brew --prefix bison@2.7)/bin:$PATH" + export PATH="$(brew --prefix bison)/bin:$PATH" export DYLD_LIBRARY_PATH=$(pwd)/libtiledb/build_deps/TileDB/dist/lib:/usr/local/lib:${DYLD_LIBRARY_PATH-} echo $DYLD_LIBRARY_PATH else diff --git a/scripts/ci/setup-macos.sh b/scripts/ci/setup-macos.sh index 9c47fed8..f4f1b7dc 100644 --- a/scripts/ci/setup-macos.sh +++ b/scripts/ci/setup-macos.sh @@ -6,7 +6,7 @@ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Install dependencies on macOS brew install \ automake \ - bison@2.7 \ + bison \ boost \ gnutls \ jemalloc \