From 63c658debcee6edf8352205250bacee36fb88a5f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 7 May 2026 14:49:57 +0000 Subject: [PATCH 1/2] Rebuild for aws-c-* (end-of-april'26) --- .ci_support/migrations/aws_c_endofapril26.yaml | 18 ++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/aws_c_endofapril26.yaml diff --git a/.ci_support/migrations/aws_c_endofapril26.yaml b/.ci_support/migrations/aws_c_endofapril26.yaml new file mode 100644 index 000000000..0656b2494 --- /dev/null +++ b/.ci_support/migrations/aws_c_endofapril26.yaml @@ -0,0 +1,18 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for aws-c-* (end-of-april'26) + kind: version + migration_number: 1 + exclude_pinned_pkgs: false + automerge: true +migrator_ts: 1777397030 +aws_c_event_stream: + - '0.7.0' +aws_c_http: + - '0.10.13' +aws_c_s3: + - '0.12.2' +aws_crt_cpp: + - '0.38.3' +s2n: + - '1.7.2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 829a9d669..ac4868719 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,7 +42,7 @@ source: folder: cpp/submodules/parquet-testing build: - number: 27 + number: 28 # for cuda support, building with one version is enough to be compatible with # all later versions, since arrow is only using libcuda, and not libcudart. skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)] From 98e1689d4fa0483eaef3a3827c32cbba4f7e111b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 7 May 2026 14:53:13 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-smithy 3.61.2 and conda-forge-pinning 2026.05.04.16.48.4 --- .azure-pipelines/azure-pipelines-osx.yml | 2 ++ .azure-pipelines/azure-pipelines-win.yml | 2 ++ .../linux_64_cuda_compiler_version12.9.yaml | 2 +- .../linux_64_cuda_compiler_versionNone.yaml | 2 +- ...nux_aarch64_cuda_compiler_version12.9.yaml | 2 +- ...nux_aarch64_cuda_compiler_versionNone.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/migrations/libboost188.yaml | 12 ------- .../migrations/libopentelemetry_cpp126.yaml | 8 ----- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .../win_64_cuda_compiler_version12.9.yaml | 2 +- .../win_64_cuda_compiler_versionNone.yaml | 2 +- .github/workflows/conda-build.yml | 7 +++- .gitignore | 1 + .scripts/run_docker_build.sh | 33 +++++++++++++++---- 16 files changed, 47 insertions(+), 36 deletions(-) delete mode 100644 .ci_support/migrations/libboost188.yaml delete mode 100644 .ci_support/migrations/libopentelemetry_cpp126.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bfe372746..b565a9bf0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,10 +12,12 @@ jobs: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 + store_build_artifacts: false osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' VMIMAGE: macOS-15 + store_build_artifacts: false timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9fc01f635..a5ace57f6 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,11 @@ jobs: win_64_cuda_compiler_version12.9: CONFIG: win_64_cuda_compiler_version12.9 UPLOAD_PACKAGES: 'True' + store_build_artifacts: false win_64_cuda_compiler_versionNone: CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' + store_build_artifacts: false timeoutInMinutes: 360 variables: CONDA_BLD_PATH: C:\\bld\\ diff --git a/.ci_support/linux_64_cuda_compiler_version12.9.yaml b/.ci_support/linux_64_cuda_compiler_version12.9.yaml index 085344255..1b7612c9b 100644 --- a/.ci_support/linux_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_64_cuda_compiler_version12.9.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_cuda_compiler_versionNone.yaml index fc44fa86a..a829b8def 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml b/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml index f80356f8f..9a23fd003 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml index 7372cef70..6acc4f092 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 8cfe9d8e6..429da526c 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/migrations/libboost188.yaml b/.ci_support/migrations/libboost188.yaml deleted file mode 100644 index 6eca3fb6a..000000000 --- a/.ci_support/migrations/libboost188.yaml +++ /dev/null @@ -1,12 +0,0 @@ -__migrator: - build_number: 1 - kind: version - commit_message: "Rebuild for libboost 1.88" - migration_number: 1 -libboost_devel: -- "1.88" -libboost_headers: -- "1.88" -libboost_python_devel: -- "1.88" -migrator_ts: 1753251695.3315456 diff --git a/.ci_support/migrations/libopentelemetry_cpp126.yaml b/.ci_support/migrations/libopentelemetry_cpp126.yaml deleted file mode 100644 index 40206aa4b..000000000 --- a/.ci_support/migrations/libopentelemetry_cpp126.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libopentelemetry_cpp 1.26 - kind: version - migration_number: 1 -libopentelemetry_cpp: -- '1.26' -migrator_ts: 1774008185.3390524 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 426b71e80..bb15ac830 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 52b530abc..e8e2f3460 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_version12.9.yaml b/.ci_support/win_64_cuda_compiler_version12.9.yaml index 2e31b420b..d1f859b5b 100644 --- a/.ci_support/win_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/win_64_cuda_compiler_version12.9.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.ci_support/win_64_cuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml index d8b503e8b..c7aa309d1 100644 --- a/.ci_support/win_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -1,5 +1,5 @@ aws_crt_cpp: -- 0.37.4 +- 0.38.3 aws_sdk_cpp: - 1.11.747 azure_core_cpp: diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 6420839f5..8f36b1c5d 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -23,26 +23,31 @@ jobs: matrix: include: - CONFIG: linux_64_cuda_compiler_version12.9 + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_64_cuda_compiler_versionNone + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_aarch64_cuda_compiler_version12.9 + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_aarch64_cuda_compiler_versionNone + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONFIG: linux_ppc64le_ + STORE_BUILD_ARTIFACTS: False UPLOAD_PACKAGES: True os: ubuntu runs_on: ['ubuntu-latest'] @@ -119,7 +124,7 @@ jobs: env: # default value; make it explicit, as it needs to match with artefact # generation below. Not configurable for now, can be revisited later - CONDA_BLD_DIR: C:\bld + CONDA_BLD_PATH: C:\bld MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge PYTHONUNBUFFERED: 1 CONFIG: ${{ matrix.CONFIG }} diff --git a/.gitignore b/.gitignore index 47b5408a8..86a9c55b4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore all files and folders in root * !/conda-forge.yml +!.recipe_maintainers.json # Don't ignore any files/folders if the parent folder is 'un-ignored' # This also avoids warnings when adding an already-checked file with an ignored parent. diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b63b5a05a..10d6a2af9 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -11,6 +11,8 @@ source .scripts/logging_utils.sh set -xeo pipefail +DOCKER_EXECUTABLE="${DOCKER_EXECUTABLE:-docker}" + THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename "$THISDIR")" @@ -27,7 +29,7 @@ if [[ "${sha:-}" == "" ]]; then popd fi -docker info +${DOCKER_EXECUTABLE} info # In order for the conda-build process in the container to write to the mounted # volumes, we need to run with the same id as the host machine, which is @@ -35,6 +37,7 @@ docker info export HOST_USER_ID=$(id -u) # Check if docker-machine is being used (normally on OSX) and get the uid from # the VM + if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) fi @@ -76,16 +79,34 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi -( endgroup "Configure Docker" ) 2> /dev/null +# Default volume suffix for Docker (preserve original behavior) +VOLUME_SUFFIX=",z" +# Podman-specific handling +if [ "${DOCKER_EXECUTABLE}" = "podman" ]; then + # Fix file permissions for rootless podman builds + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${ARTIFACTS}" + podman unshare chown -R ${HOST_USER_ID}:${HOST_USER_ID} "${RECIPE_ROOT}" + + # Add SELinux label only if enforcing + if command -v getenforce &>/dev/null && [ "$(getenforce)" = "Enforcing" ]; then + VOLUME_SUFFIX=",z" + else + VOLUME_SUFFIX="" + fi +fi + +( endgroup "Configure Docker" ) 2> /dev/null ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" export IS_PR_BUILD="${IS_PR_BUILD:-False}" -docker pull "${DOCKER_IMAGE}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + +${DOCKER_EXECUTABLE} pull "${DOCKER_IMAGE}" + +${DOCKER_EXECUTABLE} run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw${VOLUME_SUFFIX},delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw${VOLUME_SUFFIX},delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \