Prepare for merge

CURA-11622

Author: wawanbreton

.github/workflows/conan-package.yml

@@ -23,7 +23,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

.github/workflows/unit-test.yml

@@ -47,7 +47,6 @@ on:
 jobs:
   testing:
     name: Run unit tests
-# FIXME: use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main
     with:
       test_use_ctest: true

conanfile.py

@@ -74,7 +74,7 @@ def layout(self):
 
     def requirements(self):
         if self.options.geometries == "clipper":
-            self.requires("clipper/6.4.2@ultimaker/cura_11622", transitive_headers=True) # FIXME: use main after merge
+            self.requires("clipper/6.4.2@ultimaker/stable", transitive_headers=True)
         if self.options.geometries == "boost" or self.options.geometries == "clipper":
             self.requires("boost/1.83.0", transitive_headers=True)
         if self.options.optimizer == "nlopt":
@@ -98,7 +98,7 @@ 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("standardprojectsettings/[>=0.2.0]@ultimaker/stable")
         if not self.conf.get("tools.build:skip_test", False, check_type=bool):
             self.test_requires("catch2/[>=3.5.2]")