Merge pull request #47 from traversaro/dropogre112

Drop ogre 1.12 builds
conda-forge · Jun 7, 2023 · 7d4b860 · 7d4b860
2 parents 52daefb + 98d2e13
commit 7d4b860
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 225 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_OGRE_VERSION1.10.yaml → .ci_support/linux_64_.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml → .ci_support/linux_64_.yaml
@@ -1,9 +1,7 @@
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -13,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:

diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml
diff --git a/...pport/linux_aarch64_OGRE_VERSION1.10.yaml → .ci_support/linux_aarch64_.yaml b/...pport/linux_aarch64_OGRE_VERSION1.10.yaml → .ci_support/linux_aarch64_.yaml
@@ -1,11 +1,9 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -17,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:

diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml
diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml → .ci_support/osx_64_.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml → .ci_support/osx_64_.yaml
@@ -1,19 +1,17 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.14'
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '15'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:

diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml
diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml → .ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml → .ci_support/osx_arm64_.yaml
@@ -1,19 +1,17 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '15'
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:

diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml
diff --git a/.ci_support/win_64_OGRE_VERSION1.10.yaml → .ci_support/win_64_.yaml b/.ci_support/win_64_OGRE_VERSION1.10.yaml → .ci_support/win_64_.yaml
@@ -1,12 +1,10 @@
-OGRE_VERSION:
-- '1.10'
 c_compiler:
-- vs2017
+- vs2019
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
-- vs2017
+- vs2019
 target_platform:
 - win-64
diff --git a/.ci_support/win_64_OGRE_VERSION1.12.yaml b/.ci_support/win_64_OGRE_VERSION1.12.yaml
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh