Rebuild for libprotobuf 5.28.3 (#98)

automerged PR by conda-forge/automerge-action
conda-forge · Dec 30, 2024 · ab6e031 · ab6e031
2 parents f21bcf0 + 9e60d43
commit ab6e031
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 67 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
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
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,13 +17,13 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 jsoncpp:
 - 1.9.6
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 target_platform:
@@ -33,5 +33,3 @@ tinyxml2:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -1,5 +1,3 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 c_compiler:
 - gcc
 c_compiler_version:
@@ -8,10 +6,8 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,13 +17,13 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 jsoncpp:
 - 1.9.6
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 target_platform:
@@ -37,5 +33,3 @@ tinyxml2:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,13 +17,13 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 jsoncpp:
 - 1.9.6
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 target_platform:
@@ -33,5 +33,3 @@ tinyxml2:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
diff --git a/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml b/.ci_support/migrations/libgrpc167_libprotobuf5282.yaml
diff --git a/.ci_support/migrations/libprotobuf5283.yaml b/.ci_support/migrations/libprotobuf5283.yaml
@@ -0,0 +1,8 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libprotobuf 5.28.3
+  kind: version
+  migration_number: 1
+libprotobuf:
+- 5.28.3
+migrator_ts: 1729815020.8446853
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,13 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 jsoncpp:
 - 1.9.6
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,13 +17,13 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 jsoncpp:
 - 1.9.6
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 macos_machine:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -13,7 +13,7 @@ jsoncpp:
 libcurl:
 - '8'
 libprotobuf:
-- 5.28.2
+- 5.28.3
 libzip:
 - '1'
 target_platform:

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/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,7 +13,7 @@ source:
     sha256: 45bc8a6fa61da8ec8e75f488a91c433ec3db0276815bdbfc7db47ee659bd59e9
 
 build:
-  number: 13
+  number: 14
   run_exports:
     - {{ pin_subpackage(name, max_pin='x') }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ jsoncpp: @@
     libcurl:
     - '8'
     libprotobuf:
-    - 5.28.2
+    - 5.28.3
     libzip:
     - '1'
     target_platform:
@@ Expand Down @@