From 91bff9187d3ed556e0998dbcba1d4d818ed3fd92 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Wed, 5 Jun 2024 11:08:49 +1100 Subject: [PATCH] Collapse zlib builds again (#120) * Revert "Add two build for zlib 1.3 and 1.2 (#115)" This reverts commit 055c3b937ffff20cb4776d3e3b53fd8aeda66095. * 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 --- .azure-pipelines/azure-pipelines-linux.yml | 24 ++----- .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 7 +- .../{linux_64_zlib1.2.yaml => linux_64_.yaml} | 0 .ci_support/linux_64_zlib1.3.yaml | 31 --------- ...rch64_zlib1.2.yaml => linux_aarch64_.yaml} | 0 .ci_support/linux_aarch64_zlib1.3.yaml | 35 ---------- ...c64le_zlib1.2.yaml => linux_ppc64le_.yaml} | 0 .ci_support/linux_ppc64le_zlib1.3.yaml | 31 --------- .../{osx_64_zlib1.2.yaml => osx_64_.yaml} | 2 + .ci_support/osx_64_zlib1.3.yaml | 28 -------- ...osx_arm64_zlib1.2.yaml => osx_arm64_.yaml} | 2 + .ci_support/osx_arm64_zlib1.3.yaml | 28 -------- .../{win_64_zlib1.2.yaml => win_64_.yaml} | 0 .ci_support/win_64_zlib1.3.yaml | 16 ----- .gitattributes | 4 +- README.md | 66 ++++--------------- recipe/conda_build_config.yaml | 7 -- recipe/meta.yaml | 2 +- 19 files changed, 31 insertions(+), 266 deletions(-) rename .ci_support/{linux_64_zlib1.2.yaml => linux_64_.yaml} (100%) delete mode 100644 .ci_support/linux_64_zlib1.3.yaml rename .ci_support/{linux_aarch64_zlib1.2.yaml => linux_aarch64_.yaml} (100%) delete mode 100644 .ci_support/linux_aarch64_zlib1.3.yaml rename .ci_support/{linux_ppc64le_zlib1.2.yaml => linux_ppc64le_.yaml} (100%) delete mode 100644 .ci_support/linux_ppc64le_zlib1.3.yaml rename .ci_support/{osx_64_zlib1.2.yaml => osx_64_.yaml} (92%) delete mode 100644 .ci_support/osx_64_zlib1.3.yaml rename .ci_support/{osx_arm64_zlib1.2.yaml => osx_arm64_.yaml} (92%) delete mode 100644 .ci_support/osx_arm64_zlib1.3.yaml rename .ci_support/{win_64_zlib1.2.yaml => win_64_.yaml} (100%) delete mode 100644 .ci_support/win_64_zlib1.3.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d41d538..c822fd4 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,28 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_zlib1.2: - CONFIG: linux_64_zlib1.2 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_zlib1.3: - CONFIG: linux_64_zlib1.3 + linux_aarch64_: + CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_zlib1.2: - CONFIG: linux_aarch64_zlib1.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_zlib1.3: - CONFIG: linux_aarch64_zlib1.3 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_zlib1.2: - CONFIG: linux_ppc64le_zlib1.2 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_zlib1.3: - CONFIG: linux_ppc64le_zlib1.3 + linux_ppc64le_: + CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 0275d01..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,11 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_zlib1.2: - CONFIG: osx_64_zlib1.2 + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - osx_64_zlib1.3: - CONFIG: osx_64_zlib1.3 - UPLOAD_PACKAGES: 'True' - osx_arm64_zlib1.2: - CONFIG: osx_arm64_zlib1.2 - UPLOAD_PACKAGES: 'True' - osx_arm64_zlib1.3: - CONFIG: osx_arm64_zlib1.3 + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 11e882c..d609fcd 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,8 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_zlib1.2: - CONFIG: win_64_zlib1.2 - UPLOAD_PACKAGES: 'True' - win_64_zlib1.3: - CONFIG: win_64_zlib1.3 + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_zlib1.2.yaml b/.ci_support/linux_64_.yaml similarity index 100% rename from .ci_support/linux_64_zlib1.2.yaml rename to .ci_support/linux_64_.yaml diff --git a/.ci_support/linux_64_zlib1.3.yaml b/.ci_support/linux_64_zlib1.3.yaml deleted file mode 100644 index 7fbe30c..0000000 --- a/.ci_support/linux_64_zlib1.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -VERBOSE_AT: -- V=1 -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -icu: -- '73' -libiconv: -- '1' -target_platform: -- linux-64 -xz: -- '5' -zip_keys: -- - c_stdlib_version - - cdt_name -zlib: -- '1.3' diff --git a/.ci_support/linux_aarch64_zlib1.2.yaml b/.ci_support/linux_aarch64_.yaml similarity index 100% rename from .ci_support/linux_aarch64_zlib1.2.yaml rename to .ci_support/linux_aarch64_.yaml diff --git a/.ci_support/linux_aarch64_zlib1.3.yaml b/.ci_support/linux_aarch64_zlib1.3.yaml deleted file mode 100644 index 16cc7ad..0000000 --- a/.ci_support/linux_aarch64_zlib1.3.yaml +++ /dev/null @@ -1,35 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -VERBOSE_AT: -- V=1 -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -icu: -- '73' -libiconv: -- '1' -target_platform: -- linux-aarch64 -xz: -- '5' -zip_keys: -- - c_stdlib_version - - cdt_name -zlib: -- '1.3' diff --git a/.ci_support/linux_ppc64le_zlib1.2.yaml b/.ci_support/linux_ppc64le_.yaml similarity index 100% rename from .ci_support/linux_ppc64le_zlib1.2.yaml rename to .ci_support/linux_ppc64le_.yaml diff --git a/.ci_support/linux_ppc64le_zlib1.3.yaml b/.ci_support/linux_ppc64le_zlib1.3.yaml deleted file mode 100644 index 083a9b2..0000000 --- a/.ci_support/linux_ppc64le_zlib1.3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -VERBOSE_AT: -- V=1 -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 -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -icu: -- '73' -libiconv: -- '1' -target_platform: -- linux-ppc64le -xz: -- '5' -zip_keys: -- - c_stdlib_version - - cdt_name -zlib: -- '1.3' diff --git a/.ci_support/osx_64_zlib1.2.yaml b/.ci_support/osx_64_.yaml similarity index 92% rename from .ci_support/osx_64_zlib1.2.yaml rename to .ci_support/osx_64_.yaml index 0c8a57b..51b0ebf 100644 --- a/.ci_support/osx_64_zlib1.2.yaml +++ b/.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 deleted file mode 100644 index 3bcdd65..0000000 --- a/.ci_support/osx_64_zlib1.3.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -VERBOSE_AT: -- V=1 -c_compiler: -- clang_bootstrap -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.13' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -icu: -- '73' -libiconv: -- '1' -macos_machine: -- x86_64-apple-darwin13.4.0 -target_platform: -- osx-64 -xz: -- '5' -zlib: -- '1.3' diff --git a/.ci_support/osx_arm64_zlib1.2.yaml b/.ci_support/osx_arm64_.yaml similarity index 92% rename from .ci_support/osx_arm64_zlib1.2.yaml rename to .ci_support/osx_arm64_.yaml index 8d65024..6807785 100644 --- a/.ci_support/osx_arm64_zlib1.2.yaml +++ b/.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 deleted file mode 100644 index ae79d85..0000000 --- a/.ci_support/osx_arm64_zlib1.3.yaml +++ /dev/null @@ -1,28 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -VERBOSE_AT: -- V=1 -c_compiler: -- clang_bootstrap -c_compiler_version: -- '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -icu: -- '73' -libiconv: -- '1' -macos_machine: -- arm64-apple-darwin20.0.0 -target_platform: -- osx-arm64 -xz: -- '5' -zlib: -- '1.3' diff --git a/.ci_support/win_64_zlib1.2.yaml b/.ci_support/win_64_.yaml similarity index 100% rename from .ci_support/win_64_zlib1.2.yaml rename to .ci_support/win_64_.yaml diff --git a/.ci_support/win_64_zlib1.3.yaml b/.ci_support/win_64_zlib1.3.yaml deleted file mode 100644 index 3fb5a73..0000000 --- a/.ci_support/win_64_zlib1.3.yaml +++ /dev/null @@ -1,16 +0,0 @@ -VERBOSE_AT: -- V=1 -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -libiconv: -- '1' -target_platform: -- win-64 -zlib: -- '1.3' diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/README.md b/README.md index 6a4f84f..2f42561 100644 --- a/README.md +++ b/README.md @@ -35,87 +35,45 @@ Current build status - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3707632..afe48d9 100644 --- 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 index 71f1c48..318cb91 100644 --- 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/
VariantStatus
linux_64_zlib1.2linux_64 - variant + variant
linux_64_zlib1.3linux_aarch64 - variant + variant
linux_aarch64_zlib1.2linux_ppc64le - variant + variant
linux_aarch64_zlib1.3osx_64 - variant + variant
linux_ppc64le_zlib1.2osx_arm64 - variant + variant
linux_ppc64le_zlib1.3win_64 - variant - -
osx_64_zlib1.2 - - variant - -
osx_64_zlib1.3 - - variant - -
osx_arm64_zlib1.2 - - variant - -
osx_arm64_zlib1.3 - - variant - -
win_64_zlib1.2 - - variant - -
win_64_zlib1.3 - - variant + variant