diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index c3cc60a..94cc204 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_r_base4.2: - CONFIG: linux_64_r_base4.2 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_r_base4.3: - CONFIG: linux_64_r_base4.3 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_r_base4.2: - CONFIG: linux_aarch64_r_base4.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_r_base4.3: - CONFIG: linux_aarch64_r_base4.3 + linux_aarch64_: + CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d8f0cc5..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,11 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_r_base4.2: - CONFIG: osx_64_r_base4.2 + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - osx_64_r_base4.3: - CONFIG: osx_64_r_base4.3 - UPLOAD_PACKAGES: 'True' - osx_arm64_r_base4.2: - CONFIG: osx_arm64_r_base4.2 - UPLOAD_PACKAGES: 'True' - osx_arm64_r_base4.3: - CONFIG: osx_arm64_r_base4.3 + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_r_base4.3.yaml b/.ci_support/linux_64_.yaml similarity index 96% rename from .ci_support/linux_64_r_base4.3.yaml rename to .ci_support/linux_64_.yaml index f15f769..069b66a 100644 --- a/.ci_support/linux_64_r_base4.3.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_64_r_base4.2.yaml b/.ci_support/linux_64_r_base4.2.yaml deleted file mode 100644 index 5b6e751..0000000 --- a/.ci_support/linux_64_r_base4.2.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.2' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_r_base4.3.yaml b/.ci_support/linux_aarch64_.yaml similarity index 100% rename from .ci_support/linux_aarch64_r_base4.3.yaml rename to .ci_support/linux_aarch64_.yaml diff --git a/.ci_support/linux_aarch64_r_base4.2.yaml b/.ci_support/linux_aarch64_r_base4.2.yaml deleted file mode 100644 index 7ed208e..0000000 --- a/.ci_support/linux_aarch64_r_base4.2.yaml +++ /dev/null @@ -1,37 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.2' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/osx_64_r_base4.3.yaml b/.ci_support/osx_64_.yaml similarity index 100% rename from .ci_support/osx_64_r_base4.3.yaml rename to .ci_support/osx_64_.yaml diff --git a/.ci_support/osx_64_r_base4.2.yaml b/.ci_support/osx_64_r_base4.2.yaml deleted file mode 100644 index 0c3dadb..0000000 --- a/.ci_support/osx_64_r_base4.2.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -MACOSX_SDK_VERSION: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.2' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_r_base4.3.yaml b/.ci_support/osx_arm64_.yaml similarity index 100% rename from .ci_support/osx_arm64_r_base4.3.yaml rename to .ci_support/osx_arm64_.yaml diff --git a/.ci_support/osx_arm64_r_base4.2.yaml b/.ci_support/osx_arm64_r_base4.2.yaml deleted file mode 100644 index 4fde57b..0000000 --- a/.ci_support/osx_arm64_r_base4.2.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.2' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,12 @@ else --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:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --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" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index e318f41..31f43d3 100644 --- a/README.md +++ b/README.md @@ -27,59 +27,31 @@ Current build status - + - + - + - + - - - - - - - - - - - - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0239e48..12a06ad 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "16.1.0" %} +{% set version = "17.0.0" %} {% set posix = 'm2-' if win else '' %} {% set native = 'm2w64-' if win else '' %} @@ -8,11 +8,11 @@ package: source: url: https://dist.apache.org/repos/dist/release/arrow/arrow-{{ version }}/apache-arrow-{{ version }}.tar.gz - sha256: c9e60c7e87e59383d21b20dc874b17153729ee153264af6d21654b7dff2c60d7 + sha256: 9d280d8042e7cf526f8c28d170d93bfab65e50f94569f6a790982a878d8d898d build: # Skip on Windows until build problems are fixed - skip: True # [win] + skip: true # [win] merge_build_host: true # [win] number: 0 rpaths:
VariantStatus
linux_64_r_base4.2linux_64 - variant + variant
linux_64_r_base4.3linux_aarch64 - variant + variant
linux_aarch64_r_base4.2osx_64 - variant + variant
linux_aarch64_r_base4.3osx_arm64 - variant - -
osx_64_r_base4.2 - - variant - -
osx_64_r_base4.3 - - variant - -
osx_arm64_r_base4.2 - - variant - -
osx_arm64_r_base4.3 - - variant + variant