Prepare for merge

CURA-11622
Ultimaker · Dec 4, 2024 · c9e7c81 · c9e7c81
1 parent 8acb85a
commit c9e7c81
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -19,9 +19,8 @@ on:
       -
 
 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
     with:
       platform_windows: false
       platform_mac: false

diff --git a/.github/workflows/requirements-runner.txt b/.github/workflows/requirements-runner.txt
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -37,7 +37,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_pytest: true
diff --git a/.github/workflows/update-translation.yml b/.github/workflows/update-translation.yml
@@ -10,7 +10,6 @@ on:
 
 jobs:
   update-translations:
-# FIXME: Use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/update-translations.yml@main
       with:
         branch: ${{ inputs.branch }}
diff --git a/conandata.yml b/conandata.yml
@@ -1,7 +1,7 @@
 version: "5.10.0-alpha.0"
 
 requirements:
-  - "pyarcus/5.4.1@ultimaker/cura_11622"
+  - "pyarcus/5.4.1@ultimaker/stable"
 
 pip_requirements_core:
   any_os:

diff --git a/conanfile.py b/conanfile.py
@@ -23,7 +23,7 @@ class UraniumConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     package_type = "header-library"
 
-    python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622"
+    python_requires = "translationextractor/[>=2.2.0]@ultimaker/stable"
 
     options = {
         "enable_i18n": [True, False],