Don't build on MacOS

Make Linux and MacOS package compatible.
Ultimaker · Jun 16, 2023 · d95ce3d · d95ce3d
1 parent 1970567
commit d95ce3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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)