Prepare for merge

CURA-11622
Ultimaker · Dec 4, 2024 · 97dc0cc · 97dc0cc
1 parent d52b760
commit 97dc0cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -19,7 +19,6 @@ on:
       - '[0-9].[0-9][0-9]*'
 
 jobs:
-# FIXME: Use main once merged
   conan-package:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main
     secrets: inherit
diff --git a/conandata.yml b/conandata.yml
@@ -1,3 +1,3 @@
 version: "5.4.0-alpha.0"
 requirements:
-  - "savitar/[>=5.4.0]@ultimaker/cura_11622"
+  - "savitar/[>=5.4.0]@ultimaker/stable"
diff --git a/conanfile.py b/conanfile.py
@@ -25,7 +25,7 @@ class PySavitarConan(ConanFile):
     exports = "LICENSE*"
     generators = "CMakeDeps"
 
-    python_requires = "pyprojecttoolchain/[>=0.2.0]@ultimaker/cura_11622", "sipbuildtool/[>=0.3.0]@ultimaker/cura_11622"  # FIXME: use stable after merge
+    python_requires = "pyprojecttoolchain/[>=0.2.0]@ultimaker/stable", "sipbuildtool/[>=0.3.0]@ultimaker/stable"
 
     options = {
         "shared": [True, False],
@@ -83,8 +83,8 @@ def validate(self):
                 )
 
     def build_requirements(self):
-        self.test_requires("standardprojectsettings/[>=0.2.0]@ultimaker/cura_11622")  # FIXME: use stable after merge
-        self.test_requires("sipbuildtool/[>=0.3.0]@ultimaker/cura_11622")  # FIXME: use stable after merge
+        self.test_requires("standardprojectsettings/[>=0.2.0]@ultimaker/stable")
+        self.test_requires("sipbuildtool/[>=0.3.0]@ultimaker/stable")
 
     def config_options(self):
         if self.settings.os == "Windows":