From c935100c16c0ac5ac7dc223a2f338b833eef72c3 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:27:54 +0000 Subject: [PATCH 01/10] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ac0d113..245c391 100644 --- a/README.md +++ b/README.md @@ -211,3 +211,6 @@ Feedstock Maintainers * [@agcopenhaver](https://github.com/agcopenhaver/) * [@conda-forge/r](https://github.com/conda-forge/r/) + + + From 682a7c829049b72a220a9bb12003b7a7fe711bcc Mon Sep 17 00:00:00 2001 From: Mervin Fansler Date: Tue, 30 Jul 2024 13:28:50 +0200 Subject: [PATCH 02/10] add ppc64le --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c4bcde0..2e58dd0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,6 @@ build: - lib/R/lib/ - lib/ skip: true # [win] - skip: true # [ppc64le] requirements: build: From 618250ced25ac0c07d9ce4c9138cab0fa220a21d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:30:47 +0000 Subject: [PATCH 03/10] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.30.01.49.09 --- .ci_support/linux_ppc64le_.yaml | 39 +++++++++++++++++++++++++++++++++ .scripts/build_steps.sh | 1 - .travis.yml | 5 +++++ README.md | 10 ++++++--- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 .ci_support/linux_ppc64le_.yaml 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/.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/.travis.yml b/.travis.yml index 18ca8e6..0edc914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,11 @@ jobs: arch: arm64 dist: focal + - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + script: - export CI=travis - export GIT_BRANCH="$TRAVIS_BRANCH" diff --git a/README.md b/README.md index 245c391..438f728 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,13 @@ Current build status variant + + linux_ppc64le + + + variant + + osx_64 @@ -211,6 +218,3 @@ Feedstock Maintainers * [@agcopenhaver](https://github.com/agcopenhaver/) * [@conda-forge/r](https://github.com/conda-forge/r/) - - - From a9ecdc7b9306efebcdf3c7cb16f9282a836bd8ef Mon Sep 17 00:00:00 2001 From: Mervin Fansler Date: Tue, 30 Jul 2024 13:54:03 +0200 Subject: [PATCH 04/10] cross-compile --- conda-forge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 27920e5..b4b926b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,5 +1,8 @@ bot: automerge: true +build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 conda_build: pkg_format: '2' conda_forge_output_validation: true From c421de7fa0bf32ab858dd0ca9a16882cd347b565 Mon Sep 17 00:00:00 2001 From: Mervin Fansler Date: Tue, 30 Jul 2024 13:55:27 +0200 Subject: [PATCH 05/10] bump build --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2e58dd0..0465016 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: build: merge_build_host: true # [win] - number: 3 + number: 4 rpaths: - lib/R/lib/ - lib/ From 930e5e79f528dc6787b8c6e1dc215e0a4fd23ec8 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:56:42 +0000 Subject: [PATCH 06/10] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.30.01.49.09 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++++ .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .travis.yml | 30 ---------------------- README.md | 9 +------ 5 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 875d996..aef462c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,14 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_: + CONFIG: linux_aarch64_ + 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-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 3fe6769..a8b6bc9 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 geos: - 3.12.2 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 1923743..eb6ede7 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 geos: - 3.12.2 pin_run_as_build: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0edc914..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: shell - - - -jobs: - include: - - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export flow_run_id="travis_$TRAVIS_JOB_ID" - - export sha="$TRAVIS_COMMIT" - - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 438f728..7baf5ce 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
From d3fc5fffba29d25f953576e908070863a721e306 Mon Sep 17 00:00:00 2001 From: Mervin Fansler Date: Wed, 31 Jul 2024 13:25:39 +0200 Subject: [PATCH 07/10] use native ci --- conda-forge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index b4b926b..27920e5 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,5 @@ bot: automerge: true -build_platform: - linux_aarch64: linux_64 - linux_ppc64le: linux_64 conda_build: pkg_format: '2' conda_forge_output_validation: true From 7d5d860e1d56aa16880721f049bf0c28f01dd8d0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:27:30 +0000 Subject: [PATCH 08/10] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.31.04.56.44 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ------ .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .travis.yml | 30 ++++++++++++++++++++++ README.md | 9 ++++++- 5 files changed, 40 insertions(+), 11 deletions(-) create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aef462c..875d996 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,14 +12,6 @@ jobs: CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_: - CONFIG: linux_aarch64_ - 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-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index a8b6bc9..3fe6769 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -23,7 +23,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-aarch64 geos: - 3.12.2 pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index eb6ede7..1923743 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -19,7 +19,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-ppc64le geos: - 3.12.2 pin_run_as_build: diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0edc914 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: shell + + + +jobs: + include: + - env: CONFIG=linux_aarch64_ UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export flow_run_id="travis_$TRAVIS_JOB_ID" + - export sha="$TRAVIS_COMMIT" + - export remote_url="https://github.com/$TRAVIS_REPO_SLUG" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 7baf5ce..438f728 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,14 @@ Current build status ==================== -
Azure
+
+ + + From b8d4ad219da6140ef91e03cd6c2f57552ef08f97 Mon Sep 17 00:00:00 2001 From: Mervin Fansler Date: Thu, 1 Aug 2024 19:30:10 +0200 Subject: [PATCH 09/10] emulate ppc64le --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 44fd2af3b1e0b2620a60b4c305d2c945a0dec629 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 17:31:54 +0000 Subject: [PATCH 10/10] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.37.2, and conda-forge-pinning 2024.08.01.13.14.00 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++++ .ci_support/migrations/geos3122.yaml | 8 -------- .scripts/run_osx_build.sh | 2 +- .travis.yml | 5 ----- README.md | 2 +- build-locally.py | 4 ++-- 6 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 .ci_support/migrations/geos3122.yaml 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/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/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/.travis.yml b/.travis.yml index 0edc914..18ca8e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,6 @@ jobs: arch: arm64 dist: focal - - env: CONFIG=linux_ppc64le_ UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - script: - export CI=travis - export GIT_BRANCH="$TRAVIS_BRANCH" diff --git a/README.md b/README.md index 438f728..b13205d 100644 --- a/README.md +++ b/README.md @@ -216,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):
Travis + + linux + +
Azure