Update conan-package workflows to use specific branch

Conan-package workflows in both 'conan-package.yml' and 'conan-package-resources.yml' have been updated to use a specific branch ('NP-186_seperate_cura_resources') instead of 'main'. Further adjustments will be needed after the branch merge. Also, 'conan_recipe_root' attribute was added in 'conan-package-resources.yml'. Contribute to NP-186
Ultimaker · May 2, 2024 · b12f7e0 · b12f7e0
1 parent 39b48d6
commit b12f7e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml
@@ -30,10 +30,12 @@ jobs:
     with:
       project_name: cura_resources
 
+  # FIXME: Point to main, once merged
   conan-package-export:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@NP-186_seperate_cura_resources
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+      conan_recipe_root: "./resources/"
     secrets: inherit
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -33,9 +33,10 @@ jobs:
     with:
       project_name: cura
 
+  # FIXME: point to main once merged
   conan-package-export:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@NP-186_seperate_cura_resources
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}