diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2230817..c3cc60a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -25,6 +25,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 6d352af..3011eeb 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -21,6 +21,7 @@ jobs: CONFIG: osx_arm64_r_base4.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index beda247..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -68,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/recipe/0001-skip-osx-test-to-avoid-spurious-segfault.patch b/recipe/0001-skip-osx-test-to-avoid-spurious-segfault.patch index 458aeda..7e5212b 100644 --- a/recipe/0001-skip-osx-test-to-avoid-spurious-segfault.patch +++ b/recipe/0001-skip-osx-test-to-avoid-spurious-segfault.patch @@ -1,15 +1,15 @@ diff --git a/inst/tinytest/test_tiledbarray.R b/inst/tinytest/test_tiledbarray.R -index b9185e5..4311f95 100644 +index e50d8720..99875684 100644 --- a/inst/tinytest/test_tiledbarray.R +++ b/inst/tinytest/test_tiledbarray.R @@ -1,6 +1,10 @@ library(tinytest) library(tiledb) - + +# Skip for conda osx-64 build (controlled by Jinja selectors in recipe) due to +# spurious test failures +exit_file("skip for conda osx-64 build") + - isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) - if (isOldWindows) exit_file("skip this file on old Windows releases") isMacOS <- (Sys.info()['sysname'] == "Darwin") + + ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1dadcd9..f86250f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "r-tiledb" %} -{% set version = "0.24.0" %} +{% set version = "0.25.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://github.com/TileDB-Inc/TileDB-R/archive/{{ version }}.tar.gz - sha256: 5a2ce179a3c263065fd42e35b5ac49a3fd53bb4dd2479a47a8b50487502a5597 + sha256: 84e2e6b4d08f86cfcb13810f4939c0b78bca2684af7bf800ad41b7979085d729 patches: # [osx and not arm64] - 0001-skip-osx-test-to-avoid-spurious-segfault.patch # [osx and not arm64] @@ -28,18 +28,21 @@ requirements: - r-rcpp >=1.0.8 # [build_platform != target_platform] - r-rcppspdlog # [build_platform != target_platform] - r-rcppint64 # [build_platform != target_platform] + - r-nanoarrow # [build_platform != target_platform] host: - r-base - - tiledb 2.20.* + - tiledb 2.21.* - r-rcpp >=1.0.8 - r-rcppspdlog - r-nanotime - r-spdl - r-rcppint64 + - r-nanoarrow run: - r-base - r-nanotime - r-spdl + - r-nanoarrow test: requires: