Merge pull request #57 from regro-cf-autotick-bot/rebuild-libgrpc158_…

…libprotobuf4243-0-1_h276ecc Rebuild for libgrpc158_libprotobuf4243
conda-forge · Oct 9, 2023 · 10a01b9 · 10a01b9
2 parents afcad7a + 5d3b939
commit 10a01b9
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 72 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libprotobuf:
-- 4.23.4
+- 4.24.3
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -19,7 +19,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libprotobuf:
-- 4.23.4
+- 4.24.3
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml
@@ -0,0 +1,16 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+  exclude:
+    # this shouldn't attempt to modify the python feedstocks
+    - protobuf
+libgrpc:
+- "1.58"
+libprotobuf:
+- 4.24.3
+# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
+# which we cannot delete yet, but keep for clarity
+MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
+- "10.13"                  # [osx and x86_64]
+migrator_ts: 1695803907.2958245
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,17 +5,17 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 libprotobuf:
-- 4.23.4
+- 4.24.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 qt_main:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -3,17 +3,17 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '15'
+- '16'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 libprotobuf:
-- 4.23.4
+- 4.24.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 qt_main:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libprotobuf:
-- 4.23.4
+- 4.24.3
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -18,7 +18,7 @@ source:
       - support_protobuf_crosscompilation.patch
 
 build:
-  number: 4
+  number: 5
   run_exports:
     - {{ pin_subpackage(name, max_pin='x') }}