From 1a17b9e3e3ad3c7cf305e350385d9327ccf0d04e Mon Sep 17 00:00:00 2001 From: John Blischak Date: Tue, 30 Jan 2024 16:24:34 -0500 Subject: [PATCH 1/2] Set run_exports max_pin to x.x --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7a83f1b..7c3b48f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,9 +10,9 @@ source: sha256: {{ sha256 }} build: - number: 2 + number: 3 run_exports: - - {{ pin_subpackage("azure-storage-common-cpp", max_pin="x") }} + - {{ pin_subpackage("azure-storage-common-cpp", max_pin="x.x") }} # https://github.com/Azure/azure-sdk-for-cpp/blob/main/sdk/storage/azure-storage-common/vcpkg/vcpkg.json requirements: From a451c8188e7042b3a5f3bbb9e1a7a27f3a7f2f8a Mon Sep 17 00:00:00 2001 From: John Blischak Date: Tue, 30 Jan 2024 16:29:01 -0500 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.30.12.16.46 --- .ci_support/linux_64_openssl1.1.1.yaml | 2 +- .ci_support/linux_64_openssl3.yaml | 2 +- .ci_support/linux_aarch64_openssl1.1.1.yaml | 2 +- .ci_support/linux_aarch64_openssl3.yaml | 2 +- .ci_support/linux_ppc64le_openssl1.1.1.yaml | 2 +- .ci_support/linux_ppc64le_openssl3.yaml | 2 +- .ci_support/osx_64_openssl1.1.1.yaml | 2 +- .ci_support/osx_64_openssl3.yaml | 2 +- .ci_support/osx_arm64_openssl1.1.1.yaml | 2 +- .ci_support/osx_arm64_openssl3.yaml | 2 +- .gitignore | 25 +++++++++++++++++++-- .scripts/build_steps.sh | 6 ----- .scripts/run_docker_build.sh | 6 +++++ 13 files changed, 39 insertions(+), 18 deletions(-) diff --git a/.ci_support/linux_64_openssl1.1.1.yaml b/.ci_support/linux_64_openssl1.1.1.yaml index c143662..822c101 100644 --- a/.ci_support/linux_64_openssl1.1.1.yaml +++ b/.ci_support/linux_64_openssl1.1.1.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.12' +- '2' openssl: - 1.1.1 target_platform: diff --git a/.ci_support/linux_64_openssl3.yaml b/.ci_support/linux_64_openssl3.yaml index c52adaf..93cd1e9 100644 --- a/.ci_support/linux_64_openssl3.yaml +++ b/.ci_support/linux_64_openssl3.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libxml2: -- '2.12' +- '2' openssl: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.ci_support/linux_aarch64_openssl1.1.1.yaml index 8e2d2bb..e7b1a13 100644 --- a/.ci_support/linux_aarch64_openssl1.1.1.yaml +++ b/.ci_support/linux_aarch64_openssl1.1.1.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 libxml2: -- '2.12' +- '2' openssl: - 1.1.1 target_platform: diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.ci_support/linux_aarch64_openssl3.yaml index 37eb6e7..59b9d86 100644 --- a/.ci_support/linux_aarch64_openssl3.yaml +++ b/.ci_support/linux_aarch64_openssl3.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-aarch64 libxml2: -- '2.12' +- '2' openssl: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_openssl1.1.1.yaml b/.ci_support/linux_ppc64le_openssl1.1.1.yaml index bcbdd39..739f9a9 100644 --- a/.ci_support/linux_ppc64le_openssl1.1.1.yaml +++ b/.ci_support/linux_ppc64le_openssl1.1.1.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le libxml2: -- '2.12' +- '2' openssl: - 1.1.1 target_platform: diff --git a/.ci_support/linux_ppc64le_openssl3.yaml b/.ci_support/linux_ppc64le_openssl3.yaml index b014a81..546d5f8 100644 --- a/.ci_support/linux_ppc64le_openssl3.yaml +++ b/.ci_support/linux_ppc64le_openssl3.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le libxml2: -- '2.12' +- '2' openssl: - '3' target_platform: diff --git a/.ci_support/osx_64_openssl1.1.1.yaml b/.ci_support/osx_64_openssl1.1.1.yaml index 11c2589..f4b9241 100644 --- a/.ci_support/osx_64_openssl1.1.1.yaml +++ b/.ci_support/osx_64_openssl1.1.1.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_64_openssl3.yaml b/.ci_support/osx_64_openssl3.yaml index 35956e1..f6d5241 100644 --- a/.ci_support/osx_64_openssl3.yaml +++ b/.ci_support/osx_64_openssl3.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_openssl1.1.1.yaml b/.ci_support/osx_arm64_openssl1.1.1.yaml index a411fb8..003e24d 100644 --- a/.ci_support/osx_arm64_openssl1.1.1.yaml +++ b/.ci_support/osx_arm64_openssl1.1.1.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/osx_arm64_openssl3.yaml b/.ci_support/osx_arm64_openssl3.yaml index a8e66ce..1501e8b 100644 --- a/.ci_support/osx_arm64_openssl3.yaml +++ b/.ci_support/osx_arm64_openssl3.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '16' libxml2: -- '2.12' +- '2' macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.gitignore b/.gitignore index c89ecb7..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,24 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# 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. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** -build_artifacts +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ 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}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted