From 09fa6ea27599a9927dfed0b6fb22139cf7c6e39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=2E=20Cofi=C3=B1o?= Date: Tue, 21 Nov 2023 14:20:17 +0100 Subject: [PATCH 1/2] Add r_base variants --- recipe/conda_build_config.yaml | 6 ++++++ recipe/meta.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..55e8ec3 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,6 @@ +r_base: + - 3.6 + - 4.0 + - 4.1 + - 4.2 + - 4.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6f482c9..d1938fd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: build: merge_build_host: true # [win] - number: 0 + number: 1 noarch: generic rpaths: - lib/R/lib/ From 9fde124b9e476998fcb7d384f49637d28cce0426 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 13:22:41 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and conda-forge-pinning 2023.11.19.09.00.44 --- .azure-pipelines/azure-pipelines-linux.yml | 20 +++++++++++++++----- .ci_support/linux_64_r_base3.6.yaml | 16 ++++++++++++++++ .ci_support/linux_64_r_base4.0.yaml | 16 ++++++++++++++++ .ci_support/linux_64_r_base4.1.yaml | 16 ++++++++++++++++ .ci_support/migrations/r_base43.yaml | 17 ----------------- .scripts/build_steps.sh | 22 +++++++++++++++------- .scripts/logging_utils.sh | 4 ++-- .scripts/run_docker_build.sh | 3 +++ README.md | 2 +- 9 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 .ci_support/linux_64_r_base3.6.yaml create mode 100644 .ci_support/linux_64_r_base4.0.yaml create mode 100644 .ci_support/linux_64_r_base4.1.yaml delete mode 100644 .ci_support/migrations/r_base43.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index cf605a5..5fffb7f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,6 +8,18 @@ jobs: vmImage: ubuntu-latest strategy: matrix: + linux_64_r_base3.6: + CONFIG: linux_64_r_base3.6 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_r_base4.0: + CONFIG: linux_64_r_base4.0 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + 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' @@ -19,11 +31,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -34,6 +41,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.ci_support/linux_64_r_base3.6.yaml b/.ci_support/linux_64_r_base3.6.yaml new file mode 100644 index 0000000..a7d957d --- /dev/null +++ b/.ci_support/linux_64_r_base3.6.yaml @@ -0,0 +1,16 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +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: +- '3.6' +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_r_base4.0.yaml b/.ci_support/linux_64_r_base4.0.yaml new file mode 100644 index 0000000..dbd5d27 --- /dev/null +++ b/.ci_support/linux_64_r_base4.0.yaml @@ -0,0 +1,16 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +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.0' +target_platform: +- linux-64 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..f1b4e0c --- /dev/null +++ b/.ci_support/linux_64_r_base4.1.yaml @@ -0,0 +1,16 @@ +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +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 diff --git a/.ci_support/migrations/r_base43.yaml b/.ci_support/migrations/r_base43.yaml deleted file mode 100644 index ec19ef3..0000000 --- a/.ci_support/migrations/r_base43.yaml +++ /dev/null @@ -1,17 +0,0 @@ -migrator_ts: 1682187595 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - operation: key_add - commit_message: "Rebuild for r-base 4.3" - primary_key: r_base - automerge: True - longterm: True - include_noarch: True - pr_limit: 40 - conda_forge_yml_patches: - provider.win_64: win_disabled - -r_base: - - 4.3 # [not win] diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 595f8b5..ab7bc8f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,14 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba CONDARC +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -53,6 +54,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -64,9 +71,10 @@ 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" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 9236239..b70ef01 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/README.md b/README.md index a08e91c..ff14219 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance