From e1603f3efd4d5675e389dc067cb943096e3f3ba4 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 10 May 2024 13:30:49 +0200 Subject: [PATCH] Use `testing` for cura_resources Contribute to NP-186 --- .github/workflows/conan-package-resources.yml | 3 +-- .github/workflows/conan-package.yml | 3 +-- conandata.yml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package-resources.yml b/.github/workflows/conan-package-resources.yml index b1ab500432..92a7e005fa 100644 --- a/.github/workflows/conan-package-resources.yml +++ b/.github/workflows/conan-package-resources.yml @@ -30,10 +30,9 @@ 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@NP-186_seperate_cura_resources + uses: ultimaker/cura-workflows/.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 }} diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 27935b3c3e..42d03b5038 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -42,10 +42,9 @@ 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@NP-186_seperate_cura_resources + uses: ultimaker/cura-workflows/.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 }} diff --git a/conandata.yml b/conandata.yml index 1a49a013ee..1829ce60d2 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,6 +1,6 @@ version: "5.8.0-alpha.0" requirements: - - "cura_resources/(latest)@ultimaker/np_186" + - "cura_resources/(latest)@ultimaker/latest" - "uranium/(latest)@ultimaker/testing" - "curaengine/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing"