From 2b18d32673d18e566cb8bc8aee6a0e72b924ff00 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 10:12:30 +0200 Subject: [PATCH 1/3] Update meta.yaml --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1b87ca5..7a5e02a 100644 --- 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] From 813f04edddcbaefd8d34ca81e7617115ab7b466e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 10:13:12 +0200 Subject: [PATCH 2/3] Delete conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 80a67e6..0000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# This is done to de-prioritize 1.12 -OGRE_VERSION: - - "1.10" - - "1.12" From 44f56b7986edf7a93d9faa4fb8b402c31590fe17 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 08:15:38 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.06.09.57.57 --- .azure-pipelines/azure-pipelines-linux.yml | 24 ++----- .azure-pipelines/azure-pipelines-osx.yml | 14 ++-- .azure-pipelines/azure-pipelines-win.yml | 7 +- ...4_OGRE_VERSION1.10.yaml => linux_64_.yaml} | 2 - .ci_support/linux_64_OGRE_VERSION1.12.yaml | 23 ------- ...E_VERSION1.10.yaml => linux_aarch64_.yaml} | 2 - .../linux_aarch64_OGRE_VERSION1.12.yaml | 27 -------- ...E_VERSION1.10.yaml => linux_ppc64le_.yaml} | 2 - .../linux_ppc64le_OGRE_VERSION1.12.yaml | 23 ------- ..._64_OGRE_VERSION1.10.yaml => osx_64_.yaml} | 2 - .ci_support/osx_64_OGRE_VERSION1.12.yaml | 23 ------- ..._OGRE_VERSION1.10.yaml => osx_arm64_.yaml} | 2 - .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 23 ------- ..._64_OGRE_VERSION1.10.yaml => win_64_.yaml} | 2 - .ci_support/win_64_OGRE_VERSION1.12.yaml | 12 ---- README.md | 66 ++++--------------- 16 files changed, 24 insertions(+), 230 deletions(-) rename .ci_support/{linux_64_OGRE_VERSION1.10.yaml => linux_64_.yaml} (93%) delete mode 100644 .ci_support/linux_64_OGRE_VERSION1.12.yaml rename .ci_support/{linux_aarch64_OGRE_VERSION1.10.yaml => linux_aarch64_.yaml} (94%) delete mode 100644 .ci_support/linux_aarch64_OGRE_VERSION1.12.yaml rename .ci_support/{linux_ppc64le_OGRE_VERSION1.10.yaml => linux_ppc64le_.yaml} (93%) delete mode 100644 .ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml rename .ci_support/{osx_64_OGRE_VERSION1.10.yaml => osx_64_.yaml} (93%) delete mode 100644 .ci_support/osx_64_OGRE_VERSION1.12.yaml rename .ci_support/{osx_arm64_OGRE_VERSION1.10.yaml => osx_arm64_.yaml} (93%) delete mode 100644 .ci_support/osx_arm64_OGRE_VERSION1.12.yaml rename .ci_support/{win_64_OGRE_VERSION1.10.yaml => win_64_.yaml} (85%) delete mode 100644 .ci_support/win_64_OGRE_VERSION1.12.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index a0bdbd4..3b9dee7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,28 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_OGRE_VERSION1.10: - CONFIG: linux_64_OGRE_VERSION1.10 + linux_64_: + CONFIG: linux_64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_OGRE_VERSION1.12: - CONFIG: linux_64_OGRE_VERSION1.12 + linux_aarch64_: + CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_OGRE_VERSION1.10: - CONFIG: linux_aarch64_OGRE_VERSION1.10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_OGRE_VERSION1.12: - CONFIG: linux_aarch64_OGRE_VERSION1.12 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_OGRE_VERSION1.10: - CONFIG: linux_ppc64le_OGRE_VERSION1.10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_OGRE_VERSION1.12: - CONFIG: linux_ppc64le_OGRE_VERSION1.12 + linux_ppc64le_: + CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 553bd41..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,11 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_OGRE_VERSION1.10: - CONFIG: osx_64_OGRE_VERSION1.10 + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - osx_64_OGRE_VERSION1.12: - CONFIG: osx_64_OGRE_VERSION1.12 - UPLOAD_PACKAGES: 'True' - osx_arm64_OGRE_VERSION1.10: - CONFIG: osx_arm64_OGRE_VERSION1.10 - UPLOAD_PACKAGES: 'True' - osx_arm64_OGRE_VERSION1.12: - CONFIG: osx_arm64_OGRE_VERSION1.12 + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index cf48efe..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,8 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_OGRE_VERSION1.10: - CONFIG: win_64_OGRE_VERSION1.10 - UPLOAD_PACKAGES: 'True' - win_64_OGRE_VERSION1.12: - CONFIG: win_64_OGRE_VERSION1.12 + win_64_: + CONFIG: win_64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_.yaml similarity index 93% rename from .ci_support/linux_64_OGRE_VERSION1.10.yaml rename to .ci_support/linux_64_.yaml index f8db353..0f7dae2 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index fe8fdd2..0000000 --- a/.ci_support/linux_64_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,23 +0,0 @@ -OGRE_VERSION: -- '1.12' -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml b/.ci_support/linux_aarch64_.yaml similarity index 94% rename from .ci_support/linux_aarch64_OGRE_VERSION1.10.yaml rename to .ci_support/linux_aarch64_.yaml index 1f89ed3..26dfae8 100644 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index 6b17b77..0000000 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,27 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -OGRE_VERSION: -- '1.12' -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml b/.ci_support/linux_ppc64le_.yaml similarity index 93% rename from .ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml rename to .ci_support/linux_ppc64le_.yaml index 848f358..ecaba1f 100644 --- a/.ci_support/linux_ppc64le_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index dcfd99e..0000000 --- a/.ci_support/linux_ppc64le_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,23 +0,0 @@ -OGRE_VERSION: -- '1.12' -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_.yaml similarity index 93% rename from .ci_support/osx_64_OGRE_VERSION1.10.yaml rename to .ci_support/osx_64_.yaml index 9eeb47c..d968557 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index 43d7e21..0000000 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,23 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -OGRE_VERSION: -- '1.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -macos_machine: -- x86_64-apple-darwin13.4.0 -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_.yaml similarity index 93% rename from .ci_support/osx_arm64_OGRE_VERSION1.10.yaml rename to .ci_support/osx_arm64_.yaml index e458e72..862910e 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index 4ef81f1..0000000 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,23 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -OGRE_VERSION: -- '1.12' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -macos_machine: -- arm64-apple-darwin20.0.0 -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/win_64_OGRE_VERSION1.10.yaml b/.ci_support/win_64_.yaml similarity index 85% rename from .ci_support/win_64_OGRE_VERSION1.10.yaml rename to .ci_support/win_64_.yaml index e7f0b95..2614db3 100644 --- a/.ci_support/win_64_OGRE_VERSION1.10.yaml +++ b/.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 deleted file mode 100644 index bb1b2a9..0000000 --- a/.ci_support/win_64_OGRE_VERSION1.12.yaml +++ /dev/null @@ -1,12 +0,0 @@ -OGRE_VERSION: -- '1.12' -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -target_platform: -- win-64 diff --git a/README.md b/README.md index 57725ab..4795011 100644 --- a/README.md +++ b/README.md @@ -27,87 +27,45 @@ Current build status - + - + - + - + - + - + - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_OGRE_VERSION1.10linux_64 - variant + variant
linux_64_OGRE_VERSION1.12linux_aarch64 - variant + variant
linux_aarch64_OGRE_VERSION1.10linux_ppc64le - variant + variant
linux_aarch64_OGRE_VERSION1.12osx_64 - variant + variant
linux_ppc64le_OGRE_VERSION1.10osx_arm64 - variant + variant
linux_ppc64le_OGRE_VERSION1.12win_64 - variant - -
osx_64_OGRE_VERSION1.10 - - variant - -
osx_64_OGRE_VERSION1.12 - - variant - -
osx_arm64_OGRE_VERSION1.10 - - variant - -
osx_arm64_OGRE_VERSION1.12 - - variant - -
win_64_OGRE_VERSION1.10 - - variant - -
win_64_OGRE_VERSION1.12 - - variant + variant