From a46f607e50217604f5594168b28e8e1298a360d7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 6 Jun 2023 23:23:49 +0000 Subject: [PATCH 1/9] Rebuild for protobuf423 --- .ci_support/migrations/protobuf423.yaml | 11 +++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/protobuf423.yaml diff --git a/.ci_support/migrations/protobuf423.yaml b/.ci_support/migrations/protobuf423.yaml new file mode 100644 index 0000000..d3a462b --- /dev/null +++ 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/recipe/meta.yaml b/recipe/meta.yaml index c4f3e65..606231c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: sha256: 3f1ed7159f299506614fd566eb0688c4858270720008848cac5faf14e9c2c809 build: - number: 3 + number: 4 run_exports: - {{ pin_subpackage(name, max_pin='x') }} From df62362aa697f41361b584722b379b95fd65ff01 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 6 Jun 2023 23:24:24 +0000 Subject: [PATCH 2/9] 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 | 16 ++- .azure-pipelines/azure-pipelines-osx.yml | 28 +++-- .azure-pipelines/azure-pipelines-win.yml | 22 +++- ... => linux_64_libprotobuf3.21ogre1.10.yaml} | 4 +- ... => linux_64_libprotobuf3.21ogre1.12.yaml} | 4 +- .../linux_64_libprotobuf4.23.2ogre1.10.yaml | 25 ++++ .../linux_64_libprotobuf4.23.2ogre1.12.yaml | 25 ++++ ...inux_aarch64_libprotobuf3.21ogre1.10.yaml} | 4 +- ...inux_aarch64_libprotobuf3.21ogre1.12.yaml} | 4 +- ...nux_aarch64_libprotobuf4.23.2ogre1.10.yaml | 29 +++++ ...nux_aarch64_libprotobuf4.23.2ogre1.12.yaml | 29 +++++ .ci_support/migrations/libarchive36.yaml | 7 -- ...ml => osx_64_libprotobuf3.21ogre1.10.yaml} | 4 +- ...ml => osx_64_libprotobuf3.21ogre1.12.yaml} | 4 +- .../osx_64_libprotobuf4.23.2ogre1.10.yaml | 29 +++++ .../osx_64_libprotobuf4.23.2ogre1.12.yaml | 29 +++++ ...=> osx_arm64_libprotobuf3.21ogre1.10.yaml} | 4 +- ...=> osx_arm64_libprotobuf3.21ogre1.12.yaml} | 4 +- .../osx_arm64_libprotobuf4.23.2ogre1.10.yaml | 27 ++++ .../osx_arm64_libprotobuf4.23.2ogre1.12.yaml | 27 ++++ ...ml => win_64_libprotobuf3.21ogre1.10.yaml} | 0 ...ml => win_64_libprotobuf3.21ogre1.12.yaml} | 0 .../win_64_libprotobuf4.23.2ogre1.10.yaml | 14 +++ .../win_64_libprotobuf4.23.2ogre1.12.yaml | 14 +++ .scripts/build_steps.sh | 4 +- .scripts/run_osx_build.sh | 4 +- .travis.yml | 14 ++- README.md | 118 ++++++++++++++---- 28 files changed, 422 insertions(+), 71 deletions(-) rename .ci_support/{linux_64_ogre1.10.yaml => linux_64_libprotobuf3.21ogre1.10.yaml} (96%) rename .ci_support/{linux_64_ogre1.12.yaml => linux_64_libprotobuf3.21ogre1.12.yaml} (96%) create mode 100644 .ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml create mode 100644 .ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{linux_aarch64_ogre1.10.yaml => linux_aarch64_libprotobuf3.21ogre1.10.yaml} (96%) rename .ci_support/{linux_aarch64_ogre1.12.yaml => linux_aarch64_libprotobuf3.21ogre1.12.yaml} (96%) create mode 100644 .ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml create mode 100644 .ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml delete mode 100644 .ci_support/migrations/libarchive36.yaml rename .ci_support/{osx_64_ogre1.10.yaml => osx_64_libprotobuf3.21ogre1.10.yaml} (96%) rename .ci_support/{osx_64_ogre1.12.yaml => osx_64_libprotobuf3.21ogre1.12.yaml} (96%) create mode 100644 .ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml create mode 100644 .ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{osx_arm64_ogre1.10.yaml => osx_arm64_libprotobuf3.21ogre1.10.yaml} (96%) rename .ci_support/{osx_arm64_ogre1.12.yaml => osx_arm64_libprotobuf3.21ogre1.12.yaml} (96%) create mode 100644 .ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml create mode 100644 .ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{win_64_ogre1.10.yaml => win_64_libprotobuf3.21ogre1.10.yaml} (100%) rename .ci_support/{win_64_ogre1.12.yaml => win_64_libprotobuf3.21ogre1.12.yaml} (100%) create mode 100644 .ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml create mode 100644 .ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 00f7a6c..f551444 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_ogre1.10: - CONFIG: linux_64_ogre1.10 + linux_64_libprotobuf3.21ogre1.10: + CONFIG: linux_64_libprotobuf3.21ogre1.10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_ogre1.12: - CONFIG: linux_64_ogre1.12 + linux_64_libprotobuf3.21ogre1.12: + CONFIG: linux_64_libprotobuf3.21ogre1.12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_libprotobuf4.23.2ogre1.10: + CONFIG: linux_64_libprotobuf4.23.2ogre1.10 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_libprotobuf4.23.2ogre1.12: + CONFIG: linux_64_libprotobuf4.23.2ogre1.12 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 259a646..2b02775 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,29 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_ogre1.10: - CONFIG: osx_64_ogre1.10 + osx_64_libprotobuf3.21ogre1.10: + CONFIG: osx_64_libprotobuf3.21ogre1.10 UPLOAD_PACKAGES: 'True' - osx_64_ogre1.12: - CONFIG: osx_64_ogre1.12 + osx_64_libprotobuf3.21ogre1.12: + CONFIG: osx_64_libprotobuf3.21ogre1.12 UPLOAD_PACKAGES: 'True' - osx_arm64_ogre1.10: - CONFIG: osx_arm64_ogre1.10 + osx_64_libprotobuf4.23.2ogre1.10: + CONFIG: osx_64_libprotobuf4.23.2ogre1.10 UPLOAD_PACKAGES: 'True' - osx_arm64_ogre1.12: - CONFIG: osx_arm64_ogre1.12 + osx_64_libprotobuf4.23.2ogre1.12: + CONFIG: osx_64_libprotobuf4.23.2ogre1.12 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21ogre1.10: + CONFIG: osx_arm64_libprotobuf3.21ogre1.10 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf3.21ogre1.12: + CONFIG: osx_arm64_libprotobuf3.21ogre1.12 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2ogre1.10: + CONFIG: osx_arm64_libprotobuf4.23.2ogre1.10 + UPLOAD_PACKAGES: 'True' + osx_arm64_libprotobuf4.23.2ogre1.12: + CONFIG: osx_arm64_libprotobuf4.23.2ogre1.12 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 563a54a..2f97d65 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,18 +5,25 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: - win_64_ogre1.10: - CONFIG: win_64_ogre1.10 + win_64_libprotobuf3.21ogre1.10: + CONFIG: win_64_libprotobuf3.21ogre1.10 UPLOAD_PACKAGES: 'True' - win_64_ogre1.12: - CONFIG: win_64_ogre1.12 + win_64_libprotobuf3.21ogre1.12: + CONFIG: win_64_libprotobuf3.21ogre1.12 + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2ogre1.10: + CONFIG: win_64_libprotobuf4.23.2ogre1.10 + UPLOAD_PACKAGES: 'True' + win_64_libprotobuf4.23.2ogre1.12: + CONFIG: win_64_libprotobuf4.23.2ogre1.12 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -38,7 +45,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -75,6 +82,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_ogre1.10.yaml b/.ci_support/linux_64_libprotobuf3.21ogre1.10.yaml similarity index 96% rename from .ci_support/linux_64_ogre1.10.yaml rename to .ci_support/linux_64_libprotobuf3.21ogre1.10.yaml index 615cd9b..39a445d 100644 --- a/.ci_support/linux_64_ogre1.10.yaml +++ b/.ci_support/linux_64_libprotobuf3.21ogre1.10.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_64_ogre1.12.yaml b/.ci_support/linux_64_libprotobuf3.21ogre1.12.yaml similarity index 96% rename from .ci_support/linux_64_ogre1.12.yaml rename to .ci_support/linux_64_libprotobuf3.21ogre1.12.yaml index 4673e29..e0a5bcd 100644 --- a/.ci_support/linux_64_ogre1.12.yaml +++ b/.ci_support/linux_64_libprotobuf3.21ogre1.12.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: diff --git a/.ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml new file mode 100644 index 0000000..21426cb --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +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 +libprotobuf: +- 4.23.2 +ogre: +- '1.10' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml new file mode 100644 index 0000000..2634170 --- /dev/null +++ b/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '12' +cdt_name: +- cos6 +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 +libprotobuf: +- 4.23.2 +ogre: +- '1.12' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_ogre1.10.yaml b/.ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml similarity index 96% rename from .ci_support/linux_aarch64_ogre1.10.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml index 059940e..b5c3d9f 100644 --- a/.ci_support/linux_aarch64_ogre1.10.yaml +++ b/.ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: diff --git a/.ci_support/linux_aarch64_ogre1.12.yaml b/.ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml similarity index 96% rename from .ci_support/linux_aarch64_ogre1.12.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml index fe7c714..e21a241 100644 --- a/.ci_support/linux_aarch64_ogre1.12.yaml +++ b/.ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -15,7 +15,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml new file mode 100644 index 0000000..4b1841c --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml @@ -0,0 +1,29 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +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-aarch64 +libprotobuf: +- 4.23.2 +ogre: +- '1.10' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml new file mode 100644 index 0000000..9a54dfd --- /dev/null +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml @@ -0,0 +1,29 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +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-aarch64 +libprotobuf: +- 4.23.2 +ogre: +- '1.12' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/migrations/libarchive36.yaml b/.ci_support/migrations/libarchive36.yaml deleted file mode 100644 index a3829c8..0000000 --- a/.ci_support/migrations/libarchive36.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libarchive: -- '3.6' -migrator_ts: 1667327876.413553 diff --git a/.ci_support/osx_64_ogre1.10.yaml b/.ci_support/osx_64_libprotobuf3.21ogre1.10.yaml similarity index 96% rename from .ci_support/osx_64_ogre1.10.yaml rename to .ci_support/osx_64_libprotobuf3.21ogre1.10.yaml index 47723ad..df4009c 100644 --- a/.ci_support/osx_64_ogre1.10.yaml +++ b/.ci_support/osx_64_libprotobuf3.21ogre1.10.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libarchive: - '3.6' libprotobuf: diff --git a/.ci_support/osx_64_ogre1.12.yaml b/.ci_support/osx_64_libprotobuf3.21ogre1.12.yaml similarity index 96% rename from .ci_support/osx_64_ogre1.12.yaml rename to .ci_support/osx_64_libprotobuf3.21ogre1.12.yaml index 71fccb9..bd9bbac 100644 --- a/.ci_support/osx_64_ogre1.12.yaml +++ b/.ci_support/osx_64_libprotobuf3.21ogre1.12.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libarchive: - '3.6' libprotobuf: diff --git a/.ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml new file mode 100644 index 0000000..76a31cc --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libarchive: +- '3.6' +libprotobuf: +- 4.23.2 +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.13' +ogre: +- '1.10' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml new file mode 100644 index 0000000..4e92d66 --- /dev/null +++ b/.ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml @@ -0,0 +1,29 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.13' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libarchive: +- '3.6' +libprotobuf: +- 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: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_ogre1.10.yaml b/.ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml similarity index 96% rename from .ci_support/osx_arm64_ogre1.10.yaml rename to .ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml index 8f56138..ef48208 100644 --- a/.ci_support/osx_arm64_ogre1.10.yaml +++ b/.ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libarchive: - '3.6' libprotobuf: diff --git a/.ci_support/osx_arm64_ogre1.12.yaml b/.ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml similarity index 96% rename from .ci_support/osx_arm64_ogre1.12.yaml rename to .ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml index 4e8ee85..330d1a8 100644 --- a/.ci_support/osx_arm64_ogre1.12.yaml +++ b/.ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' libarchive: - '3.6' libprotobuf: diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml new file mode 100644 index 0000000..da53bd7 --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml @@ -0,0 +1,27 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libarchive: +- '3.6' +libprotobuf: +- 4.23.2 +macos_machine: +- arm64-apple-darwin20.0.0 +ogre: +- '1.10' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml new file mode 100644 index 0000000..0d90721 --- /dev/null +++ b/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml @@ -0,0 +1,27 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +libarchive: +- '3.6' +libprotobuf: +- 4.23.2 +macos_machine: +- arm64-apple-darwin20.0.0 +ogre: +- '1.12' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/win_64_ogre1.10.yaml b/.ci_support/win_64_libprotobuf3.21ogre1.10.yaml similarity index 100% rename from .ci_support/win_64_ogre1.10.yaml rename to .ci_support/win_64_libprotobuf3.21ogre1.10.yaml diff --git a/.ci_support/win_64_ogre1.12.yaml b/.ci_support/win_64_libprotobuf3.21ogre1.12.yaml similarity index 100% rename from .ci_support/win_64_ogre1.12.yaml rename to .ci_support/win_64_libprotobuf3.21ogre1.12.yaml diff --git a/.ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml new file mode 100644 index 0000000..781038f --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libprotobuf: +- 4.23.2 +ogre: +- '1.10' +target_platform: +- win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml new file mode 100644 index 0000000..319f70f --- /dev/null +++ b/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2019 +libprotobuf: +- 4.23.2 +ogre: +- '1.12' +target_platform: +- win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/.travis.yml b/.travis.yml index 4c2b11d..27e4293 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,22 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_ogre1.10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_libprotobuf3.21ogre1.10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_ogre1.12 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_libprotobuf3.21ogre1.12 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_libprotobuf4.23.2ogre1.10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_libprotobuf4.23.2ogre1.12 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal diff --git a/README.md b/README.md index 1741b9c..48491b6 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About libignition-sensors -========================= +About libignition-sensors-feedstock +=================================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libignition-sensors-feedstock/blob/main/LICENSE.txt) Home: https://github.com/ignitionrobotics/ign-sensors Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/libignition-sensors-feedstock/blob/main/LICENSE.txt) - Summary: Ignition Robotics library that provide numerous sensor models designed to generate realistic data from simulation environments. Current build status @@ -34,73 +34,143 @@ Current build status - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + From ad91386c439260811b8bd02b4e8fc0d7fde10844 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 08:38:49 +0200 Subject: [PATCH 3/9] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 62c8a60..3bd6639 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,12 +2,3 @@ macos_min_version: # [osx and x86_64] - 10.13 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - 10.13 # [osx and x86_64] - -ogre: - - 1.10 - - 1.12 - -c_compiler: # [win] -- vs2019 # [win] -cxx_compiler: # [win] -- vs2019 # [win] From 6b4fc75320983d990cc328649d2702542fd82d43 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 08:42:59 +0200 Subject: [PATCH 4/9] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 3bd6639..f6c22b2 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,7 @@ macos_min_version: # [osx and x86_64] - 10.13 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - 10.13 # [osx and x86_64] + +ogre: + - 1.10 + - 1.12 From 8ebd7c9b2fd8e564403c501184a68dbb587679d4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 08:43:46 +0200 Subject: [PATCH 5/9] Create 351.patch --- recipe/351.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 recipe/351.patch diff --git a/recipe/351.patch b/recipe/351.patch new file mode 100644 index 0000000..4249681 --- /dev/null +++ b/recipe/351.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b274d160..51817fc2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,9 +38,7 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") + + #-------------------------------------- + # Find Protobuf +-set(REQ_PROTOBUF_VER 3) + ign_find_package(IgnProtobuf +- VERSION ${REQ_PROTOBUF_VER} + REQUIRED + PRETTY Protobuf) + From 4dcb79c3f7302004a80688a95910b004f79459d2 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 08:44:14 +0200 Subject: [PATCH 6/9] Update meta.yaml --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 606231c..5edf935 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,8 @@ package: source: - url: https://github.com/ignitionrobotics/ign-{{ component_name }}/archive/ignition-{{ component_name }}{{ version }}.tar.gz sha256: 3f1ed7159f299506614fd566eb0688c4858270720008848cac5faf14e9c2c809 + patches: + - 351.patch build: number: 4 From b24dc94098ca42d2015a869bc374b2cd93d5c14d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 10:00:04 +0200 Subject: [PATCH 7/9] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index f6c22b2..3bd6639 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,7 +2,3 @@ macos_min_version: # [osx and x86_64] - 10.13 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - 10.13 # [osx and x86_64] - -ogre: - - 1.10 - - 1.12 From b611f1d5febbc44aafcd2762354e26eac3903c03 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 7 Jun 2023 10:00:19 +0200 Subject: [PATCH 8/9] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5edf935..34cd3a5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ requirements: - libignition-plugin1 - libsdformat12 - libarchive # [osx] - - ogre {{ ogre }} + - ogre 1.10.* run: - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] From df4b7f267fcaabcfd0b33c5c5f916fe72d84f05c 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:02:46 +0000 Subject: [PATCH 9/9] 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 | 16 +-- .azure-pipelines/azure-pipelines-osx.yml | 28 ++--- .azure-pipelines/azure-pipelines-win.yml | 14 +-- ....10.yaml => linux_64_libprotobuf3.21.yaml} | 2 - .../linux_64_libprotobuf3.21ogre1.12.yaml | 25 ---- ...0.yaml => linux_64_libprotobuf4.23.2.yaml} | 2 - .../linux_64_libprotobuf4.23.2ogre1.12.yaml | 25 ---- ...aml => linux_aarch64_libprotobuf3.21.yaml} | 2 - ...linux_aarch64_libprotobuf3.21ogre1.12.yaml | 29 ----- ...l => linux_aarch64_libprotobuf4.23.2.yaml} | 2 - ...nux_aarch64_libprotobuf4.23.2ogre1.12.yaml | 29 ----- ...e1.10.yaml => osx_64_libprotobuf3.21.yaml} | 2 - .../osx_64_libprotobuf3.21ogre1.12.yaml | 29 ----- ....10.yaml => osx_64_libprotobuf4.23.2.yaml} | 2 - .../osx_64_libprotobuf4.23.2ogre1.12.yaml | 29 ----- ...10.yaml => osx_arm64_libprotobuf3.21.yaml} | 2 - .../osx_arm64_libprotobuf3.21ogre1.12.yaml | 27 ----- ....yaml => osx_arm64_libprotobuf4.23.2.yaml} | 2 - .../osx_arm64_libprotobuf4.23.2ogre1.12.yaml | 27 ----- ...e1.10.yaml => win_64_libprotobuf3.21.yaml} | 2 - .../win_64_libprotobuf3.21ogre1.12.yaml | 14 --- ....10.yaml => win_64_libprotobuf4.23.2.yaml} | 2 - .../win_64_libprotobuf4.23.2ogre1.12.yaml | 14 --- .travis.yml | 14 +-- README.md | 110 ++++-------------- 25 files changed, 38 insertions(+), 412 deletions(-) rename .ci_support/{linux_64_libprotobuf3.21ogre1.10.yaml => linux_64_libprotobuf3.21.yaml} (95%) delete mode 100644 .ci_support/linux_64_libprotobuf3.21ogre1.12.yaml rename .ci_support/{linux_64_libprotobuf4.23.2ogre1.10.yaml => linux_64_libprotobuf4.23.2.yaml} (95%) delete mode 100644 .ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{linux_aarch64_libprotobuf3.21ogre1.10.yaml => linux_aarch64_libprotobuf3.21.yaml} (96%) delete mode 100644 .ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml rename .ci_support/{linux_aarch64_libprotobuf4.23.2ogre1.10.yaml => linux_aarch64_libprotobuf4.23.2.yaml} (96%) delete mode 100644 .ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{osx_64_libprotobuf3.21ogre1.10.yaml => osx_64_libprotobuf3.21.yaml} (96%) delete mode 100644 .ci_support/osx_64_libprotobuf3.21ogre1.12.yaml rename .ci_support/{osx_64_libprotobuf4.23.2ogre1.10.yaml => osx_64_libprotobuf4.23.2.yaml} (96%) delete mode 100644 .ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{osx_arm64_libprotobuf3.21ogre1.10.yaml => osx_arm64_libprotobuf3.21.yaml} (96%) delete mode 100644 .ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml rename .ci_support/{osx_arm64_libprotobuf4.23.2ogre1.10.yaml => osx_arm64_libprotobuf4.23.2.yaml} (96%) delete mode 100644 .ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml rename .ci_support/{win_64_libprotobuf3.21ogre1.10.yaml => win_64_libprotobuf3.21.yaml} (91%) delete mode 100644 .ci_support/win_64_libprotobuf3.21ogre1.12.yaml rename .ci_support/{win_64_libprotobuf4.23.2ogre1.10.yaml => win_64_libprotobuf4.23.2.yaml} (91%) delete mode 100644 .ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f551444..dbc294f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_libprotobuf3.21ogre1.10: - CONFIG: linux_64_libprotobuf3.21ogre1.10 + linux_64_libprotobuf3.21: + CONFIG: linux_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libprotobuf3.21ogre1.12: - CONFIG: linux_64_libprotobuf3.21ogre1.12 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libprotobuf4.23.2ogre1.10: - CONFIG: linux_64_libprotobuf4.23.2ogre1.10 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_libprotobuf4.23.2ogre1.12: - CONFIG: linux_64_libprotobuf4.23.2ogre1.12 + linux_64_libprotobuf4.23.2: + CONFIG: linux_64_libprotobuf4.23.2 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 2b02775..e251113 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,29 +8,17 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_libprotobuf3.21ogre1.10: - CONFIG: osx_64_libprotobuf3.21ogre1.10 + osx_64_libprotobuf3.21: + CONFIG: osx_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_64_libprotobuf3.21ogre1.12: - CONFIG: osx_64_libprotobuf3.21ogre1.12 + osx_64_libprotobuf4.23.2: + CONFIG: osx_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' - osx_64_libprotobuf4.23.2ogre1.10: - CONFIG: osx_64_libprotobuf4.23.2ogre1.10 + osx_arm64_libprotobuf3.21: + CONFIG: osx_arm64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - osx_64_libprotobuf4.23.2ogre1.12: - CONFIG: osx_64_libprotobuf4.23.2ogre1.12 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf3.21ogre1.10: - CONFIG: osx_arm64_libprotobuf3.21ogre1.10 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf3.21ogre1.12: - CONFIG: osx_arm64_libprotobuf3.21ogre1.12 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf4.23.2ogre1.10: - CONFIG: osx_arm64_libprotobuf4.23.2ogre1.10 - UPLOAD_PACKAGES: 'True' - osx_arm64_libprotobuf4.23.2ogre1.12: - CONFIG: osx_arm64_libprotobuf4.23.2ogre1.12 + osx_arm64_libprotobuf4.23.2: + CONFIG: osx_arm64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2f97d65..4ed2701 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_libprotobuf3.21ogre1.10: - CONFIG: win_64_libprotobuf3.21ogre1.10 + win_64_libprotobuf3.21: + CONFIG: win_64_libprotobuf3.21 UPLOAD_PACKAGES: 'True' - win_64_libprotobuf3.21ogre1.12: - CONFIG: win_64_libprotobuf3.21ogre1.12 - UPLOAD_PACKAGES: 'True' - win_64_libprotobuf4.23.2ogre1.10: - CONFIG: win_64_libprotobuf4.23.2ogre1.10 - UPLOAD_PACKAGES: 'True' - win_64_libprotobuf4.23.2ogre1.12: - CONFIG: win_64_libprotobuf4.23.2ogre1.12 + win_64_libprotobuf4.23.2: + CONFIG: win_64_libprotobuf4.23.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_libprotobuf3.21ogre1.10.yaml b/.ci_support/linux_64_libprotobuf3.21.yaml similarity index 95% rename from .ci_support/linux_64_libprotobuf3.21ogre1.10.yaml rename to .ci_support/linux_64_libprotobuf3.21.yaml index 39a445d..8f5d025 100644 --- a/.ci_support/linux_64_libprotobuf3.21ogre1.10.yaml +++ b/.ci_support/linux_64_libprotobuf3.21.yaml @@ -16,8 +16,6 @@ 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_libprotobuf3.21ogre1.12.yaml b/.ci_support/linux_64_libprotobuf3.21ogre1.12.yaml deleted file mode 100644 index e0a5bcd..0000000 --- a/.ci_support/linux_64_libprotobuf3.21ogre1.12.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -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 -libprotobuf: -- '3.21' -ogre: -- '1.12' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/linux_64_libprotobuf4.23.2.yaml similarity index 95% rename from .ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml rename to .ci_support/linux_64_libprotobuf4.23.2.yaml index 21426cb..7540ed9 100644 --- a/.ci_support/linux_64_libprotobuf4.23.2ogre1.10.yaml +++ b/.ci_support/linux_64_libprotobuf4.23.2.yaml @@ -16,8 +16,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: - 4.23.2 -ogre: -- '1.10' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml deleted file mode 100644 index 2634170..0000000 --- a/.ci_support/linux_64_libprotobuf4.23.2ogre1.12.yaml +++ /dev/null @@ -1,25 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -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 -libprotobuf: -- 4.23.2 -ogre: -- '1.12' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml b/.ci_support/linux_aarch64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml rename to .ci_support/linux_aarch64_libprotobuf3.21.yaml index b5c3d9f..31eb238 100644 --- a/.ci_support/linux_aarch64_libprotobuf3.21ogre1.10.yaml +++ b/.ci_support/linux_aarch64_libprotobuf3.21.yaml @@ -20,8 +20,6 @@ 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_libprotobuf3.21ogre1.12.yaml b/.ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml deleted file mode 100644 index e21a241..0000000 --- a/.ci_support/linux_aarch64_libprotobuf3.21ogre1.12.yaml +++ /dev/null @@ -1,29 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -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-aarch64 -libprotobuf: -- '3.21' -ogre: -- '1.12' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml similarity index 96% rename from .ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml rename to .ci_support/linux_aarch64_libprotobuf4.23.2.yaml index 4b1841c..313a490 100644 --- a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.10.yaml +++ b/.ci_support/linux_aarch64_libprotobuf4.23.2.yaml @@ -20,8 +20,6 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 libprotobuf: - 4.23.2 -ogre: -- '1.10' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml deleted file mode 100644 index 9a54dfd..0000000 --- a/.ci_support/linux_aarch64_libprotobuf4.23.2ogre1.12.yaml +++ /dev/null @@ -1,29 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -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-aarch64 -libprotobuf: -- 4.23.2 -ogre: -- '1.12' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf3.21ogre1.10.yaml b/.ci_support/osx_64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/osx_64_libprotobuf3.21ogre1.10.yaml rename to .ci_support/osx_64_libprotobuf3.21.yaml index df4009c..673e16d 100644 --- a/.ci_support/osx_64_libprotobuf3.21ogre1.10.yaml +++ b/.ci_support/osx_64_libprotobuf3.21.yaml @@ -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_libprotobuf3.21ogre1.12.yaml b/.ci_support/osx_64_libprotobuf3.21ogre1.12.yaml deleted file mode 100644 index bd9bbac..0000000 --- a/.ci_support/osx_64_libprotobuf3.21ogre1.12.yaml +++ /dev/null @@ -1,29 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libarchive: -- '3.6' -libprotobuf: -- '3.21' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.13' -ogre: -- '1.12' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/osx_64_libprotobuf4.23.2.yaml similarity index 96% rename from .ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml rename to .ci_support/osx_64_libprotobuf4.23.2.yaml index 76a31cc..c124951 100644 --- a/.ci_support/osx_64_libprotobuf4.23.2ogre1.10.yaml +++ b/.ci_support/osx_64_libprotobuf4.23.2.yaml @@ -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_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml deleted file mode 100644 index 4e92d66..0000000 --- a/.ci_support/osx_64_libprotobuf4.23.2ogre1.12.yaml +++ /dev/null @@ -1,29 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.13' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libarchive: -- '3.6' -libprotobuf: -- 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: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml b/.ci_support/osx_arm64_libprotobuf3.21.yaml similarity index 96% rename from .ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml rename to .ci_support/osx_arm64_libprotobuf3.21.yaml index ef48208..3d8309b 100644 --- a/.ci_support/osx_arm64_libprotobuf3.21ogre1.10.yaml +++ b/.ci_support/osx_arm64_libprotobuf3.21.yaml @@ -18,8 +18,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_libprotobuf3.21ogre1.12.yaml b/.ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml deleted file mode 100644 index 330d1a8..0000000 --- a/.ci_support/osx_arm64_libprotobuf3.21ogre1.12.yaml +++ /dev/null @@ -1,27 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libarchive: -- '3.6' -libprotobuf: -- '3.21' -macos_machine: -- arm64-apple-darwin20.0.0 -ogre: -- '1.12' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml similarity index 96% rename from .ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml rename to .ci_support/osx_arm64_libprotobuf4.23.2.yaml index da53bd7..d152f08 100644 --- a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.10.yaml +++ b/.ci_support/osx_arm64_libprotobuf4.23.2.yaml @@ -18,8 +18,6 @@ libprotobuf: - 4.23.2 macos_machine: - arm64-apple-darwin20.0.0 -ogre: -- '1.10' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml deleted file mode 100644 index 0d90721..0000000 --- a/.ci_support/osx_arm64_libprotobuf4.23.2ogre1.12.yaml +++ /dev/null @@ -1,27 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' -libarchive: -- '3.6' -libprotobuf: -- 4.23.2 -macos_machine: -- arm64-apple-darwin20.0.0 -ogre: -- '1.12' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/win_64_libprotobuf3.21ogre1.10.yaml b/.ci_support/win_64_libprotobuf3.21.yaml similarity index 91% rename from .ci_support/win_64_libprotobuf3.21ogre1.10.yaml rename to .ci_support/win_64_libprotobuf3.21.yaml index 890fb07..5c84d3b 100644 --- a/.ci_support/win_64_libprotobuf3.21ogre1.10.yaml +++ b/.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_libprotobuf3.21ogre1.12.yaml b/.ci_support/win_64_libprotobuf3.21ogre1.12.yaml deleted file mode 100644 index 5c4fa52..0000000 --- a/.ci_support/win_64_libprotobuf3.21ogre1.12.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libprotobuf: -- '3.21' -ogre: -- '1.12' -target_platform: -- win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml b/.ci_support/win_64_libprotobuf4.23.2.yaml similarity index 91% rename from .ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml rename to .ci_support/win_64_libprotobuf4.23.2.yaml index 781038f..adb705f 100644 --- a/.ci_support/win_64_libprotobuf4.23.2ogre1.10.yaml +++ b/.ci_support/win_64_libprotobuf4.23.2.yaml @@ -8,7 +8,5 @@ cxx_compiler: - vs2019 libprotobuf: - 4.23.2 -ogre: -- '1.10' target_platform: - win-64 diff --git a/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml b/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml deleted file mode 100644 index 319f70f..0000000 --- a/.ci_support/win_64_libprotobuf4.23.2ogre1.12.yaml +++ /dev/null @@ -1,14 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libprotobuf: -- 4.23.2 -ogre: -- '1.12' -target_platform: -- win-64 diff --git a/.travis.yml b/.travis.yml index 27e4293..57c6966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,12 @@ language: generic matrix: include: - - env: CONFIG=linux_aarch64_libprotobuf3.21ogre1.10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_libprotobuf3.21 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_libprotobuf3.21ogre1.12 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_libprotobuf4.23.2ogre1.10 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 - os: linux - arch: arm64 - dist: focal - - - env: CONFIG=linux_aarch64_libprotobuf4.23.2ogre1.12 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + - env: CONFIG=linux_aarch64_libprotobuf4.23.2 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 dist: focal diff --git a/README.md b/README.md index 48491b6..a5ab7dd 100644 --- a/README.md +++ b/README.md @@ -34,143 +34,73 @@ Current build status
VariantStatus
linux_64_ogre1.10linux_64_libprotobuf3.21ogre1.10 + + variant + +
linux_64_libprotobuf3.21ogre1.12 + + variant + +
linux_64_libprotobuf4.23.2ogre1.10 + + variant + +
linux_64_libprotobuf4.23.2ogre1.12 + + variant + +
linux_aarch64_libprotobuf3.21ogre1.10 + + variant + +
linux_aarch64_libprotobuf3.21ogre1.12 + + variant + +
linux_aarch64_libprotobuf4.23.2ogre1.10 + + variant + +
linux_aarch64_libprotobuf4.23.2ogre1.12 + + variant + +
osx_64_libprotobuf3.21ogre1.10 + + variant + +
osx_64_libprotobuf3.21ogre1.12 + + variant + +
osx_64_libprotobuf4.23.2ogre1.10 - variant + variant
linux_64_ogre1.12osx_64_libprotobuf4.23.2ogre1.12 - variant + variant
linux_aarch64_ogre1.10osx_arm64_libprotobuf3.21ogre1.10 - variant + variant
linux_aarch64_ogre1.12osx_arm64_libprotobuf3.21ogre1.12 - variant + variant
osx_64_ogre1.10osx_arm64_libprotobuf4.23.2ogre1.10 - variant + variant
osx_64_ogre1.12osx_arm64_libprotobuf4.23.2ogre1.12 - variant + variant
osx_arm64_ogre1.10win_64_libprotobuf3.21ogre1.10 - variant + variant
osx_arm64_ogre1.12win_64_libprotobuf3.21ogre1.12 - variant + variant
win_64_ogre1.10win_64_libprotobuf4.23.2ogre1.10 - variant + variant
win_64_ogre1.12win_64_libprotobuf4.23.2ogre1.12 - variant + variant
- + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_libprotobuf3.21ogre1.10linux_64_libprotobuf3.21 - variant + variant
linux_64_libprotobuf3.21ogre1.12linux_64_libprotobuf4.23.2 - variant + variant
linux_64_libprotobuf4.23.2ogre1.10linux_aarch64_libprotobuf3.21 - variant + variant
linux_64_libprotobuf4.23.2ogre1.12linux_aarch64_libprotobuf4.23.2 - variant + variant
linux_aarch64_libprotobuf3.21ogre1.10osx_64_libprotobuf3.21 - variant + variant
linux_aarch64_libprotobuf3.21ogre1.12osx_64_libprotobuf4.23.2 - variant + variant
linux_aarch64_libprotobuf4.23.2ogre1.10osx_arm64_libprotobuf3.21 - variant + variant
linux_aarch64_libprotobuf4.23.2ogre1.12osx_arm64_libprotobuf4.23.2 - variant + variant
osx_64_libprotobuf3.21ogre1.10win_64_libprotobuf3.21 - variant + variant
osx_64_libprotobuf3.21ogre1.12win_64_libprotobuf4.23.2 - variant - -
osx_64_libprotobuf4.23.2ogre1.10 - - variant - -
osx_64_libprotobuf4.23.2ogre1.12 - - variant - -
osx_arm64_libprotobuf3.21ogre1.10 - - variant - -
osx_arm64_libprotobuf3.21ogre1.12 - - variant - -
osx_arm64_libprotobuf4.23.2ogre1.10 - - variant - -
osx_arm64_libprotobuf4.23.2ogre1.12 - - variant - -
win_64_libprotobuf3.21ogre1.10 - - variant - -
win_64_libprotobuf3.21ogre1.12 - - variant - -
win_64_libprotobuf4.23.2ogre1.10 - - variant - -
win_64_libprotobuf4.23.2ogre1.12 - - variant + variant