From bab209ab3e93599caab5373b787dd22b09898d77 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 26 May 2024 20:10:23 +0200 Subject: [PATCH 1/2] Disable ppc64le --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f7911df..89291dc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,10 @@ source: - 996.patch build: - number: 2 + number: 3 + # gz-sim 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 625544bb191ca452e936223814f5e83dfff61172 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:12:54 +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 ---- .ci_support/linux_ppc64le_.yaml | 21 --------------------- .ci_support/osx_64_.yaml | 4 +++- .ci_support/osx_arm64_.yaml | 2 ++ .gitattributes | 4 ++-- README.md | 7 ------- 6 files changed, 7 insertions(+), 35 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 aef462c..94cc204 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-cos7-x86_64 - linux_ppc64le_: - CONFIG: linux_ppc64le_ - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml deleted file mode 100644 index ecaba1f..0000000 --- a/.ci_support/linux_ppc64le_.yaml +++ /dev/null @@ -1,21 +0,0 @@ -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_.yaml b/.ci_support/osx_64_.yaml index cd507ed..3be52a4 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' c_compiler: - clang c_compiler_version: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 12945c4..58c1504 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' c_compiler: - clang c_compiler_version: 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 4134284..81c1a32 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,6 @@ Current build status variant - - linux_ppc64le - - - variant - - osx_64