Collapse zlib builds again (#120)

* Revert "Add two build for zlib 1.3 and 1.2 (#115)" This reverts commit 055c3b9. * bump build number * MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and conda-forge-pinning 2024.06.03.19.07.16
conda-forge · Jun 5, 2024 · 91bff91 · 91bff91
1 parent 320c9eb
commit 91bff91
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 266 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_zlib1.2.yaml → .ci_support/linux_64_.yaml b/.ci_support/linux_64_zlib1.2.yaml → .ci_support/linux_64_.yaml
diff --git a/.ci_support/linux_64_zlib1.3.yaml b/.ci_support/linux_64_zlib1.3.yaml
diff --git a/.ci_support/linux_aarch64_zlib1.2.yaml → .ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_zlib1.2.yaml → .ci_support/linux_aarch64_.yaml
diff --git a/.ci_support/linux_aarch64_zlib1.3.yaml b/.ci_support/linux_aarch64_zlib1.3.yaml
diff --git a/.ci_support/linux_ppc64le_zlib1.2.yaml → .ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_zlib1.2.yaml → .ci_support/linux_ppc64le_.yaml
diff --git a/.ci_support/linux_ppc64le_zlib1.3.yaml b/.ci_support/linux_ppc64le_zlib1.3.yaml
diff --git a/.ci_support/osx_64_zlib1.2.yaml → .ci_support/osx_64_.yaml b/.ci_support/osx_64_zlib1.2.yaml → .ci_support/osx_64_.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 VERBOSE_AT:
 - V=1
 c_compiler:

diff --git a/.ci_support/osx_64_zlib1.3.yaml b/.ci_support/osx_64_zlib1.3.yaml
diff --git a/.ci_support/osx_arm64_zlib1.2.yaml → .ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_zlib1.2.yaml → .ci_support/osx_arm64_.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
 VERBOSE_AT:
 - V=1
 c_compiler:

diff --git a/.ci_support/osx_arm64_zlib1.3.yaml b/.ci_support/osx_arm64_zlib1.3.yaml
diff --git a/.ci_support/win_64_zlib1.2.yaml → .ci_support/win_64_.yaml b/.ci_support/win_64_zlib1.2.yaml → .ci_support/win_64_.yaml
diff --git a/.ci_support/win_64_zlib1.3.yaml b/.ci_support/win_64_zlib1.3.yaml
diff --git a/.gitattributes b/.gitattributes
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -2,10 +2,3 @@ c_compiler:        # [osx]
 - clang_bootstrap  # [osx]
 cxx_compiler:      # [osx]
 - clang_bootstrap  # [osx]
-
-# 2024/03
-# Avoiding a full migration for now
-# https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/5443
-zlib:
-  - '1.2'
-  - '1.3'
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -11,7 +11,7 @@ source:
     - 0002-Make-and-install-a-pkg-config-file-on-Windows.patch
 
 build:
-  number: 0
+  number: 1
   run_exports:
     # remove symbols at minor versions according to
     #    https://abi-laboratory.pro/tracker/timeline/libxml2/