Use testing for cura_resources

Contribute to NP-186
Ultimaker · May 10, 2024 · e1603f3 · e1603f3
1 parent 52cf75a
commit e1603f3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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"