Prepare for merge

Ultimaker · Dec 4, 2024 · bc3e5c4 · bc3e5c4
1 parent fe2711b
commit bc3e5c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -21,7 +21,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/conanfile.py b/conanfile.py
@@ -24,7 +24,7 @@ class ArcusConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     exports = "LICENSE*"
     package_type = "library"
-    python_requires = "sentrylibrary/1.0.0@ultimaker/cura_11622" # FIXME: use main after merge
+    python_requires = "sentrylibrary/1.0.0@ultimaker/stable"
     python_requires_extend = "sentrylibrary.SentryLibrary"
 
     options = {
@@ -114,7 +114,7 @@ def validate(self):
                     raise ConanInvalidConfiguration(f"Unable to enable Sentry because no {sentry_setting} was configured")
 
     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")
         self.tool_requires("protobuf/3.21.12")
 
     def generate(self):

diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -9,7 +9,7 @@ class ArcusTestConan(ConanFile):
     test_type = "explicit"
 
     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")
         self.tool_requires("protobuf/3.21.12")
 
     def requirements(self):