Use the common package creation workflow

Ultimaker · Sep 12, 2024 · 9a0b2f4 · 9a0b2f4
1 parent c394240
commit 9a0b2f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -39,36 +39,10 @@ jobs:
     secrets: inherit
 
   # FIXME: Use main once merged
-  conan-package-create-macos:
+  conan-package-create:
     needs: [ conan-recipe-version, conan-recipe-export ]
     #if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@CURA-11622_conan_v2
-    with:
-      recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-      recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }}
-      recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }}
-      recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }}
-      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-    secrets: inherit
-
-  # FIXME: Use main once merged
-  conan-package-create-windows:
-    needs: [ conan-recipe-version, conan-recipe-export ]
-    #if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@CURA-11622_conan_v2
-    with:
-      recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-      recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }}
-      recipe_id_user: ${{ needs.conan-recipe-version.outputs.user }}
-      recipe_id_channel: ${{ needs.conan-recipe-version.outputs.channel }}
-      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-    secrets: inherit
-
-  # FIXME: Use main once merged
-  conan-package-create-linux:
-    needs: [ conan-recipe-version, conan-recipe-export ]
-    #if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create.yml@CURA-11622_conan_v2
     with:
       recipe_id_name: ${{ needs.conan-recipe-version.outputs.project_name }}
       recipe_id_version: ${{ needs.conan-recipe-version.outputs.recipe_semver_full }}

diff --git a/conanfile.py b/conanfile.py
@@ -104,8 +104,8 @@ def generate(self):
         # Generate the pyproject.toml
         pp = self.python_requires["pyprojecttoolchain"].module.PyProjectToolchain(self)
         pp.blocks["tool_sip_project"].values["sip_files_dir"] = str(Path("python").as_posix())
-        pp.blocks["tool_sip_bindings"].values["name"] = "pyArcus"
         pp.blocks["tool_sip_metadata"].values["name"] = "pyArcus"
+        pp.blocks["tool_sip_bindings"].values["name"] = "pyArcus"
         pp.blocks["extra_sources"].values["headers"] = ["PythonMessage.h"]
         pp.blocks["extra_sources"].values["sources"] = [str(Path("src", "PythonMessage.cpp").as_posix())]
         pp.generate()