Merge pull request #11 from traversaro/dropogre112

Remove builds with ogre 1.12
conda-forge · Jun 7, 2023 · f8b696e · f8b696e
2 parents 0fe2513 + 44f56b7
commit f8b696e
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 238 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,5 +1,3 @@
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - gcc
 c_compiler_version:

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,7 +1,5 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml
diff --git a/...pport/linux_ppc64le_OGRE_VERSION1.10.yaml → .ci_support/linux_ppc64le_.yaml b/...pport/linux_ppc64le_OGRE_VERSION1.10.yaml → .ci_support/linux_ppc64le_.yaml
@@ -1,5 +1,3 @@
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - gcc
 c_compiler_version:

diff --git a/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml b/.ci_support/linux_ppc64le_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,7 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - clang
 c_compiler_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,7 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - clang
 c_compiler_version:

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,5 +1,3 @@
-OGRE_VERSION:
-- '1.10'
 c_compiler:
 - vs2019
 channel_sources:

diff --git a/.ci_support/win_64_OGRE_VERSION1.12.yaml b/.ci_support/win_64_OGRE_VERSION1.12.yaml
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -55,11 +55,7 @@ outputs:
         - libgz-plugin2
         - libgz-utils2
         - ogre-next
-        {% if OGRE_VERSION == "1.10" %}
         - ogre 1.10.*
-        {% else %}
-        - ogre 1.12.*
-        {% endif %}
       run:
         - xorg-libx11                        # [unix]
         - xorg-libxext                       # [unix]