diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..d8cdad0 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,10 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml new file mode 100644 index 0000000..1923743 --- /dev/null +++ b/.ci_support/linux_ppc64le_.yaml @@ -0,0 +1,39 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cran_mirror: +- https://cran.r-project.org +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +geos: +- 3.12.2 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +proj: +- '9.4' +r_base: +- '4.3' +target_platform: +- linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/migrations/geos3122.yaml b/.ci_support/migrations/geos3122.yaml deleted file mode 100644 index 8c98c2f..0000000 --- a/.ci_support/migrations/geos3122.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for geos 3.12.2 - kind: version - migration_number: 1 -geos: -- 3.12.2 -migrator_ts: 1717700470.407194 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ 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 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/README.md b/README.md index ac0d113..b13205d 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,13 @@ Current build status variant + + linux_ppc64le + + + variant + + osx_64 @@ -209,5 +216,5 @@ Feedstock Maintainers ===================== * [@agcopenhaver](https://github.com/agcopenhaver/) -* [@conda-forge/r](https://github.com/conda-forge/r/) +* [@conda-forge/r](https://github.com/orgs/conda-forge/teams/r/) diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/conda-forge.yml b/conda-forge.yml index 27920e5..ec889b2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,6 +8,6 @@ github: tooling_branch_name: main provider: linux_aarch64: default - linux_ppc64le: default + linux_ppc64le: azure win: azure test: native_and_emulated diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c4bcde0..0465016 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,12 +14,11 @@ source: build: merge_build_host: true # [win] - number: 3 + number: 4 rpaths: - lib/R/lib/ - lib/ skip: true # [win] - skip: true # [ppc64le] requirements: build: