Prepare for merge

CURA-11622
Ultimaker · Dec 4, 2024 · 2895969 · 2895969
1 parent f5b2dd7
commit 2895969
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -23,7 +23,6 @@ on:
       - '[0-9].[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/.github/workflows/unit-test-post.yml b/.github/workflows/unit-test-post.yml
@@ -7,8 +7,7 @@ on:
 
 jobs:
   publish-test-results:
-# FIXME: use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@main
     with:
       event: ${{ github.event.workflow_run.event }}
       conclusion: ${{ github.event.workflow_run.conclusion }}

diff --git a/.github/workflows/unit-test.yml b/.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
diff --git a/conanfile.py b/conanfile.py
@@ -83,7 +83,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("gtest/1.14.0")