From 9c6436d36cbf7aafccd2e64680b9caa7411e460c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Jul 2023 15:02:15 +1100 Subject: [PATCH 1/2] manually migrate proto 4 --- .../migrations/libprotobuf4233_libgrpc156.yaml | 11 +++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libprotobuf4233_libgrpc156.yaml diff --git a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml new file mode 100644 index 0000000..5fd0340 --- /dev/null +++ b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml @@ -0,0 +1,11 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libgrpc: +- '1.54' +- '1.56' +libprotobuf: +- '3.21' +- '4.23.3' +migrator_ts: 1688154716.9176981 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index abe4dd3..42abf17 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ source: - patches/0002-disable-aiplatform-feature.patch # [not (linux64 or osx)] build: - number: 0 + number: 1 requirements: build: - {{ compiler('c') }} From 90c1bb43deaeaca26bf0a123a1fed84f703f5a68 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 2 Jul 2023 15:03:51 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.01.21.06.50 --- .azure-pipelines/azure-pipelines-linux.yml | 12 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 8 +++---- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- ...inux_64_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- ...aarch64_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- ...ppc64le_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- .ci_support/migrations/protobuf423.yaml | 11 --------- ... osx_64_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- ...x_arm64_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- ... win_64_libgrpc1.56libprotobuf4.23.3.yaml} | 4 ++-- README.md | 24 +++++++++---------- 11 files changed, 36 insertions(+), 47 deletions(-) rename .ci_support/{linux_64_libgrpc1.55libprotobuf4.23.2.yaml => linux_64_libgrpc1.56libprotobuf4.23.3.yaml} (96%) rename .ci_support/{linux_aarch64_libgrpc1.55libprotobuf4.23.2.yaml => linux_aarch64_libgrpc1.56libprotobuf4.23.3.yaml} (96%) rename .ci_support/{linux_ppc64le_libgrpc1.55libprotobuf4.23.2.yaml => linux_ppc64le_libgrpc1.56libprotobuf4.23.3.yaml} (96%) delete mode 100644 .ci_support/migrations/protobuf423.yaml rename .ci_support/{osx_64_libgrpc1.55libprotobuf4.23.2.yaml => osx_64_libgrpc1.56libprotobuf4.23.3.yaml} (96%) rename .ci_support/{osx_arm64_libgrpc1.55libprotobuf4.23.2.yaml => osx_arm64_libgrpc1.56libprotobuf4.23.3.yaml} (96%) rename .ci_support/{win_64_libgrpc1.55libprotobuf4.23.2.yaml => win_64_libgrpc1.56libprotobuf4.23.3.yaml} (94%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index ac1a4b0..2ee9a8b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,24 +12,24 @@ jobs: CONFIG: linux_64_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libgrpc1.55libprotobuf4.23.2: - CONFIG: linux_64_libgrpc1.55libprotobuf4.23.2 + linux_64_libgrpc1.56libprotobuf4.23.3: + CONFIG: linux_64_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_libgrpc1.54libprotobuf3.21: CONFIG: linux_aarch64_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_libgrpc1.55libprotobuf4.23.2: - CONFIG: linux_aarch64_libgrpc1.55libprotobuf4.23.2 + linux_aarch64_libgrpc1.56libprotobuf4.23.3: + CONFIG: linux_aarch64_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_libgrpc1.54libprotobuf3.21: CONFIG: linux_ppc64le_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_libgrpc1.55libprotobuf4.23.2: - CONFIG: linux_ppc64le_libgrpc1.55libprotobuf4.23.2 + linux_ppc64le_libgrpc1.56libprotobuf4.23.3: + CONFIG: linux_ppc64le_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 0e09e5d..b01371c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,14 +11,14 @@ jobs: osx_64_libgrpc1.54libprotobuf3.21: CONFIG: osx_64_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_64_libgrpc1.55libprotobuf4.23.2: - CONFIG: osx_64_libgrpc1.55libprotobuf4.23.2 + osx_64_libgrpc1.56libprotobuf4.23.3: + CONFIG: osx_64_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' osx_arm64_libgrpc1.54libprotobuf3.21: CONFIG: osx_arm64_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_arm64_libgrpc1.55libprotobuf4.23.2: - CONFIG: osx_arm64_libgrpc1.55libprotobuf4.23.2 + osx_arm64_libgrpc1.56libprotobuf4.23.3: + CONFIG: osx_arm64_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 796898f..5e5fab4 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,8 +11,8 @@ jobs: win_64_libgrpc1.54libprotobuf3.21: CONFIG: win_64_libgrpc1.54libprotobuf3.21 UPLOAD_PACKAGES: 'True' - win_64_libgrpc1.55libprotobuf4.23.2: - CONFIG: win_64_libgrpc1.55libprotobuf4.23.2 + win_64_libgrpc1.56libprotobuf4.23.3: + CONFIG: win_64_libgrpc1.56libprotobuf4.23.3 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/linux_64_libgrpc1.56libprotobuf4.23.3.yaml similarity index 96% rename from .ci_support/linux_64_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/linux_64_libgrpc1.56libprotobuf4.23.3.yaml index 417846d..953dc48 100644 --- a/.ci_support/linux_64_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/linux_64_libgrpc1.56libprotobuf4.23.3.yaml @@ -21,9 +21,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 openssl: - '3' target_platform: diff --git a/.ci_support/linux_aarch64_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_libgrpc1.56libprotobuf4.23.3.yaml similarity index 96% rename from .ci_support/linux_aarch64_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/linux_aarch64_libgrpc1.56libprotobuf4.23.3.yaml index 0986df5..f668996 100644 --- a/.ci_support/linux_aarch64_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/linux_aarch64_libgrpc1.56libprotobuf4.23.3.yaml @@ -25,9 +25,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 openssl: - '3' target_platform: diff --git a/.ci_support/linux_ppc64le_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/linux_ppc64le_libgrpc1.56libprotobuf4.23.3.yaml similarity index 96% rename from .ci_support/linux_ppc64le_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/linux_ppc64le_libgrpc1.56libprotobuf4.23.3.yaml index a544a3a..1464cd5 100644 --- a/.ci_support/linux_ppc64le_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/linux_ppc64le_libgrpc1.56libprotobuf4.23.3.yaml @@ -21,9 +21,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 openssl: - '3' target_platform: diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml deleted file mode 100644 index d3a462b..0000000 --- a/.ci_support/migrations/protobuf423.yaml +++ /dev/null @@ -1,11 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 2 -libgrpc: -- '1.54' -- '1.55' -libprotobuf: -- '3.21' -- '4.23.2' -migrator_ts: 1684932016.2362208 diff --git a/.ci_support/osx_64_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/osx_64_libgrpc1.56libprotobuf4.23.3.yaml similarity index 96% rename from .ci_support/osx_64_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/osx_64_libgrpc1.56libprotobuf4.23.3.yaml index b95aad3..e65c2bb 100644 --- a/.ci_support/osx_64_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/osx_64_libgrpc1.56libprotobuf4.23.3.yaml @@ -19,9 +19,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_libgrpc1.56libprotobuf4.23.3.yaml similarity index 96% rename from .ci_support/osx_arm64_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/osx_arm64_libgrpc1.56libprotobuf4.23.3.yaml index cf248f5..2364850 100644 --- a/.ci_support/osx_arm64_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/osx_arm64_libgrpc1.56libprotobuf4.23.3.yaml @@ -19,9 +19,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/win_64_libgrpc1.55libprotobuf4.23.2.yaml b/.ci_support/win_64_libgrpc1.56libprotobuf4.23.3.yaml similarity index 94% rename from .ci_support/win_64_libgrpc1.55libprotobuf4.23.2.yaml rename to .ci_support/win_64_libgrpc1.56libprotobuf4.23.3.yaml index 2f3dc28..633e7a8 100644 --- a/.ci_support/win_64_libgrpc1.55libprotobuf4.23.2.yaml +++ b/.ci_support/win_64_libgrpc1.56libprotobuf4.23.3.yaml @@ -13,9 +13,9 @@ libcrc32c: libcurl: - '8' libgrpc: -- '1.55' +- '1.56' libprotobuf: -- 4.23.2 +- 4.23.3 openssl: - '3' target_platform: diff --git a/README.md b/README.md index 2c5694f..93c3d1e 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,10 @@ Current build status - linux_64_libgrpc1.55libprotobuf4.23.2 + linux_64_libgrpc1.56libprotobuf4.23.3 - variant + variant @@ -48,10 +48,10 @@ Current build status - linux_aarch64_libgrpc1.55libprotobuf4.23.2 + linux_aarch64_libgrpc1.56libprotobuf4.23.3 - variant + variant @@ -62,10 +62,10 @@ Current build status - linux_ppc64le_libgrpc1.55libprotobuf4.23.2 + linux_ppc64le_libgrpc1.56libprotobuf4.23.3 - variant + variant @@ -76,10 +76,10 @@ Current build status - osx_64_libgrpc1.55libprotobuf4.23.2 + osx_64_libgrpc1.56libprotobuf4.23.3 - variant + variant @@ -90,10 +90,10 @@ Current build status - osx_arm64_libgrpc1.55libprotobuf4.23.2 + osx_arm64_libgrpc1.56libprotobuf4.23.3 - variant + variant @@ -104,10 +104,10 @@ Current build status - win_64_libgrpc1.55libprotobuf4.23.2 + win_64_libgrpc1.56libprotobuf4.23.3 - variant + variant