Merge pull request #42 from regro-cf-autotick-bot/rebuild-protobuf423…

…-0-2_h1f4b88 Rebuild for protobuf423 and drop ogre1.12 builds
conda-forge · Jun 7, 2023 · f158913 · f158913
2 parents b260b12 + df4b7f2
commit f158913
Show file tree

Hide file tree

Showing 22 changed files with 102 additions and 107 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_ogre1.10.yaml → .ci_support/linux_64_libprotobuf3.21.yaml b/.ci_support/linux_64_ogre1.10.yaml → .ci_support/linux_64_libprotobuf3.21.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,13 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libprotobuf:
 - '3.21'
-ogre:
-- '1.10'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_64_ogre1.12.yaml → .ci_support/linux_64_libprotobuf4.23.2.yaml b/.ci_support/linux_64_ogre1.12.yaml → .ci_support/linux_64_libprotobuf4.23.2.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,13 +11,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libprotobuf:
-- '3.21'
-ogre:
-- '1.12'
+- 4.23.2
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_ogre1.10.yaml → ...upport/linux_aarch64_libprotobuf3.21.yaml b/.ci_support/linux_aarch64_ogre1.10.yaml → ...upport/linux_aarch64_libprotobuf3.21.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,13 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 libprotobuf:
 - '3.21'
-ogre:
-- '1.10'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_ogre1.12.yaml → ...port/linux_aarch64_libprotobuf4.23.2.yaml b/.ci_support/linux_aarch64_ogre1.12.yaml → ...port/linux_aarch64_libprotobuf4.23.2.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '11'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -15,13 +15,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '11'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 libprotobuf:
-- '3.21'
-ogre:
-- '1.12'
+- 4.23.2
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/migrations/libarchive36.yaml b/.ci_support/migrations/libarchive36.yaml
diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml
@@ -0,0 +1,11 @@
+__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_ogre1.10.yaml → .ci_support/osx_64_libprotobuf3.21.yaml b/.ci_support/osx_64_ogre1.10.yaml → .ci_support/osx_64_libprotobuf3.21.yaml
@@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libarchive:
 - '3.6'
 libprotobuf:
@@ -20,8 +20,6 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
 - '10.13'
-ogre:
-- '1.10'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_ogre1.12.yaml → .ci_support/osx_64_libprotobuf4.23.2.yaml b/.ci_support/osx_64_ogre1.12.yaml → .ci_support/osx_64_libprotobuf4.23.2.yaml
@@ -3,25 +3,23 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libarchive:
 - '3.6'
 libprotobuf:
-- '3.21'
+- 4.23.2
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
 - '10.13'
-ogre:
-- '1.12'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_ogre1.10.yaml → .ci_support/osx_arm64_libprotobuf3.21.yaml b/.ci_support/osx_arm64_ogre1.10.yaml → .ci_support/osx_arm64_libprotobuf3.21.yaml
@@ -3,23 +3,21 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libarchive:
 - '3.6'
 libprotobuf:
 - '3.21'
 macos_machine:
 - arm64-apple-darwin20.0.0
-ogre:
-- '1.10'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/osx_arm64_ogre1.12.yaml → .ci_support/osx_arm64_libprotobuf4.23.2.yaml b/.ci_support/osx_arm64_ogre1.12.yaml → .ci_support/osx_arm64_libprotobuf4.23.2.yaml
@@ -3,23 +3,21 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 libarchive:
 - '3.6'
 libprotobuf:
-- '3.21'
+- 4.23.2
 macos_machine:
 - arm64-apple-darwin20.0.0
-ogre:
-- '1.12'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_ogre1.10.yaml → .ci_support/win_64_libprotobuf3.21.yaml b/.ci_support/win_64_ogre1.10.yaml → .ci_support/win_64_libprotobuf3.21.yaml
@@ -8,7 +8,5 @@ cxx_compiler:
 - vs2019
 libprotobuf:
 - '3.21'
-ogre:
-- '1.10'
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_ogre1.12.yaml → .ci_support/win_64_libprotobuf4.23.2.yaml b/.ci_support/win_64_ogre1.12.yaml → .ci_support/win_64_libprotobuf4.23.2.yaml
@@ -7,8 +7,6 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libprotobuf:
-- '3.21'
-ogre:
-- '1.12'
+- 4.23.2
 target_platform:
 - win-64
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.travis.yml b/.travis.yml