From d1eec30d0ea3ae8eb3d6af28ebe020a399475221 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 14 May 2023 19:32:42 +1100 Subject: [PATCH 1/2] remove skip for R 4.1 on unix --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e66a72..6db4284 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,8 +11,6 @@ source: sha256: ddd8347882775e53af7d0965a1902b7d8fcd0a030fd14f783d4f85e821352d52 build: - # 4.1 not usable anymore unless https://github.com/conda-forge/r-base-feedstock/pull/236 gets merged - skip: true # [unix and (r_base == "4.1")] merge_build_host: true # [win] number: 0 rpaths: From 47e32ea4099124786bc5be5f00426563bdbfe1a2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 14 May 2023 19:35:09 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.14.06.16.39 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++ .azure-pipelines/azure-pipelines-osx.yml | 6 +++++ .ci_support/linux_64_r_base4.1.yaml | 27 +++++++++++++++++++ .ci_support/linux_aarch64_r_base4.1.yaml | 31 ++++++++++++++++++++++ .ci_support/osx_64_r_base4.1.yaml | 27 +++++++++++++++++++ .ci_support/osx_arm64_r_base4.1.yaml | 27 +++++++++++++++++++ README.md | 28 +++++++++++++++++++ 7 files changed, 154 insertions(+) create mode 100644 .ci_support/linux_64_r_base4.1.yaml create mode 100644 .ci_support/linux_aarch64_r_base4.1.yaml create mode 100644 .ci_support/osx_64_r_base4.1.yaml create mode 100644 .ci_support/osx_arm64_r_base4.1.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 68b3eb4..f759dc1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,18 @@ jobs: vmImage: ubuntu-latest strategy: matrix: + linux_64_r_base4.1: + CONFIG: linux_64_r_base4.1 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_r_base4.2: CONFIG: linux_64_r_base4.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_r_base4.1: + CONFIG: linux_aarch64_r_base4.1 + 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' diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index fa38b8c..70585ad 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,15 @@ jobs: vmImage: macOS-11 strategy: matrix: + osx_64_r_base4.1: + CONFIG: osx_64_r_base4.1 + UPLOAD_PACKAGES: 'True' osx_64_r_base4.2: CONFIG: osx_64_r_base4.2 UPLOAD_PACKAGES: 'True' + osx_arm64_r_base4.1: + CONFIG: osx_arm64_r_base4.1 + UPLOAD_PACKAGES: 'True' osx_arm64_r_base4.2: CONFIG: osx_arm64_r_base4.2 UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_r_base4.1.yaml b/.ci_support/linux_64_r_base4.1.yaml new file mode 100644 index 0000000..e63767c --- /dev/null +++ b/.ci_support/linux_64_r_base4.1.yaml @@ -0,0 +1,27 @@ +c_compiler: +- gcc +c_compiler_version: +- '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.1' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_r_base4.1.yaml b/.ci_support/linux_aarch64_r_base4.1.yaml new file mode 100644 index 0000000..2b80b02 --- /dev/null +++ b/.ci_support/linux_aarch64_r_base4.1.yaml @@ -0,0 +1,31 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '12' +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.1' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_r_base4.1.yaml b/.ci_support/osx_64_r_base4.1.yaml new file mode 100644 index 0000000..6be6c2f --- /dev/null +++ b/.ci_support/osx_64_r_base4.1.yaml @@ -0,0 +1,27 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +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.1' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_r_base4.1.yaml b/.ci_support/osx_arm64_r_base4.1.yaml new file mode 100644 index 0000000..0ce856f --- /dev/null +++ b/.ci_support/osx_arm64_r_base4.1.yaml @@ -0,0 +1,27 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.1' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/README.md b/README.md index 6a50389..c92fb23 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,26 @@ Current build status + + + + + + + + + + + +
VariantStatus
linux_64_r_base4.1 + + variant + +
linux_64_r_base4.2 variant
linux_aarch64_r_base4.1 + + variant + +
linux_aarch64_r_base4.2 @@ -40,6 +54,13 @@ Current build status variant
osx_64_r_base4.1 + + variant + +
osx_64_r_base4.2 @@ -47,6 +68,13 @@ Current build status variant
osx_arm64_r_base4.1 + + variant + +
osx_arm64_r_base4.2