From d95ce3d571a9981078f3df00f2152491bb13af5b Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 16 Jun 2023 12:47:56 +0200 Subject: [PATCH] Don't build on MacOS Make Linux and MacOS package compatible. --- .github/workflows/conan-package.yml | 12 ------------ conanfile.py | 4 ++++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 22e26e2..d668b75 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -27,18 +27,6 @@ jobs: with: project_name: cura_binary_data - conan-package-export-macos: - needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} - runs_on: 'macos-10.15' - python_version: '3.10.x' - conan_logging_level: 'info' - conan_export_binaries: true - secrets: inherit - conan-package-export-linux: needs: [ conan-recipe-version ] uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main diff --git a/conanfile.py b/conanfile.py index 982de3a..da3df84 100644 --- a/conanfile.py +++ b/conanfile.py @@ -52,3 +52,7 @@ def package_info(self): def package_id(self): del self.info.settings.compiler del self.info.settings.build_type + if self.settings.os != "Windows": + compatible_pkg = self.info.clone() + compatible_pkg.settings.os = "Linux" + self.compatible_packages.append(compatible_pkg)