From 6c6c9407b8c0b839380535822ce1a33428fbf15b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 26 May 2024 20:12:50 +0200 Subject: [PATCH 1/2] Update meta.yaml --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e9457db..bb39c75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,10 @@ source: - workaround_win_base_test.patch # [win] build: - number: 1 + number: 2 + # gz-physics requires gz-common's geospatial component, that requires + # gdal that is not available on ppc64le https://github.com/conda-forge/gdal-feedstock/issues/918 + skip: true # [ppc64le] outputs: - name: {{ cxx_name }} From 5ba9616f332d88797c6b0b34221da5b254003016 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 26 May 2024 18:15:17 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and conda-forge-pinning 2024.05.26.15.18.22 --- .azure-pipelines/azure-pipelines-linux.yml | 4 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 6 ---- .ci_support/linux_aarch64_.yaml | 6 ---- .ci_support/linux_ppc64le_.yaml | 33 ---------------------- .ci_support/osx_64_.yaml | 8 ++---- .ci_support/osx_arm64_.yaml | 6 ++-- .ci_support/win_64_.yaml | 4 --- .gitattributes | 4 +-- README.md | 7 ----- 10 files changed, 8 insertions(+), 72 deletions(-) delete mode 100644 .ci_support/linux_ppc64le_.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index bdf1723..56857c7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,10 +16,6 @@ jobs: CONFIG: linux_aarch64_ UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_: - CONFIG: linux_ppc64le_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a626..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6b038dd..9302818 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -6,10 +6,6 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' cdt_name: - cos6 channel_sources: @@ -29,5 +25,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 472932e..ac59b53 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -8,10 +8,6 @@ c_compiler: - gcc c_compiler_version: - '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,5 +29,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml deleted file mode 100644 index 92370eb..0000000 --- a/.ci_support/linux_ppc64le_.yaml +++ /dev/null @@ -1,33 +0,0 @@ -assimp: -- 5.3.1 -bullet_cpp: -- '3.25' -c_compiler: -- gcc -c_compiler_version: -- '12' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -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-ppc64le -libode: -- 0.16.2 -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9203fd0..4bbec0d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' assimp: - 5.3.1 bullet_cpp: @@ -8,10 +10,6 @@ c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 288ce4e..e7f12a3 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' assimp: - 5.3.1 bullet_cpp: @@ -8,10 +10,6 @@ c_compiler: - clang c_compiler_version: - '16' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index d771045..c8f4658 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -4,10 +4,6 @@ bullet_cpp: - '3.25' c_compiler: - vs2019 -c_stdlib: -- vs -c_stdlib_version: -- '2019' channel_sources: - conda-forge channel_targets: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/README.md b/README.md index 6ccab6e..e69d475 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,6 @@ Current build status variant - - linux_ppc64le - - - variant - - osx_64