GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 10:35:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update conan-package workflows to use specific branch

Browse Source 
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
This commit is contained in:
Jelle Spijker 2024-05-02 13:52:06 +02:00
parent 39b48d6f69
commit b12f7e0ff6
No known key found for this signature in database
GPG Key ID: 0E9129B3096F4E72
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/conan-package-resources.yml vendored
View File

@ -30,10 +30,12 @@ jobs:
with: with:
project_name: cura_resources project_name: cura_resources
# FIXME: Point to main, once merged
conan-package-export: conan-package-export:
needs: [ conan-recipe-version ] 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: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
conan_recipe_root: "./resources/"
secrets: inherit secrets: inherit

3
.github/workflows/conan-package.yml vendored
View File

@ -33,9 +33,10 @@ jobs:
with: with:
project_name: cura project_name: cura
# FIXME: point to main once merged
conan-package-export: conan-package-export:
needs: [ conan-recipe-version ] 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: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}