From b12f7e0ff6367a1039c41beb90244dd4a8c3738f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 2 May 2024 13:52:06 +0200 Subject: [PATCH] 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 --- .github/workflows/conan-package-resources.yml | 4 +++- .github/workflows/conan-package.yml | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index 7f9ea93a6fc..d180e25ded9 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 55470425d78..ed1ac63a70b 100644 --- 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 }}