Prepare for merge

CURA-11622

.github/workflows/benchmark.yml

@@ -31,13 +31,11 @@ permissions:
 
 jobs:
   check_actor:
-# FIXME: use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
   benchmark:
-# FIXME: use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
       conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
       benchmark_cmd: "./build/Release/benchmark/benchmarks --benchmark_format=json --benchmark_out=benchmark_result.json"

.github/workflows/conan-package.yml

@@ -39,9 +39,8 @@ 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
     with:
       platform_wasm: true
     secrets: inherit

.github/workflows/gcodeanalyzer.yml

@@ -35,17 +35,14 @@ jobs:
     needs: [ check_actor ]
     if: ${{ needs.check_actor.outputs.proceed == 'true' }}
     uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
-    with:
-      project_name: curaengine
 
   gcodeanalyzer:
     needs: [ conan-recipe-version ]
     name: Run GCodeAnalyzer on the engine
     runs-on: ubuntu-latest
     steps:
       - name: Setup the build environment
-# FIXME: use main once merged
-        uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2
+        uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
         with:
           install_system_dependencies: true
 

.github/workflows/lint-tidier.yml

@@ -11,5 +11,4 @@ on:
 jobs:
   lint-tidier-job:
     name: Auto-apply clang-tidy
-# FIXME: use main once merged
-    uses: ultimaker/cura-workflows/.github/workflows/lint-tidier.yml@CURA-11622_conan_v2
+    uses: ultimaker/cura-workflows/.github/workflows/lint-tidier.yml@main

.github/workflows/npm-package.yml

@@ -97,4 +97,4 @@ jobs:
         run: |
           conan remove "cura_private_data/*" --force
           conan remove "fdm_materials/*" --force
-          conan upload "*" -r cura --all -c
+          conan upload "*" -r cura --all -c

.github/workflows/process-pull-request.yml

@@ -8,7 +8,7 @@ jobs:
   add_label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-ecosystem/action-add-labels@v1
         if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
         with:

.github/workflows/stress_benchmark.yml

@@ -41,8 +41,6 @@ jobs:
     needs: [ check_actor ]
     if: ${{ needs.check_actor.outputs.proceed == 'true' }}
     uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
-    with:
-      project_name: curaengine
 
   benchmark:
     needs: [ conan-recipe-version ]
@@ -55,4 +53,4 @@ jobs:
       output_file_path: "build/Release/benchmark_result.json"
       data_dir: "dev/stress_bench"
       tool: "customSmallerIsBetter"
-    secrets: inherit
+    secrets: inherit

.github/workflows/unit-test.yml

@@ -39,7 +39,6 @@ permissions:
 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

conandata.yml

@@ -1,10 +1,10 @@
 version: "5.10.0-alpha.0"
 commit: "unknown"
 requirements:
-  - "scripta/[>=1.1.0]@ultimaker/cura_11622"
+  - "scripta/[>=1.1.0]@ultimaker/stable"
 requirements_arcus:
-  - "arcus/5.4.1@ultimaker/cura_11622"
+  - "arcus/5.4.1@ultimaker/stable"
 requirements_plugins:
-  - "curaengine_grpc_definitions/0.3.0@ultimaker/cura_11622"
+  - "curaengine_grpc_definitions/0.3.0@ultimaker/stable"
 requirements_cura_resources:
   - "cura_resources/[*]@ultimaker/testing"

conanfile.py

@@ -22,7 +22,7 @@ class CuraEngineConan(ConanFile):
     exports = "LICENSE*"
     settings = "os", "compiler", "build_type", "arch"
     package_type = "application"
-    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 = {
@@ -88,7 +88,7 @@ def validate(self):
             check_min_cppstd(self, 20)
 
     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 self.options.enable_arcus or self.options.enable_plugins:
             self.tool_requires("protobuf/3.21.12")
         if not self.conf.get("tools.build:skip_test", False, check_type=bool):
@@ -115,15 +115,15 @@ def requirements(self):
                 self.requires(req)
         if self.options.enable_arcus or self.options.enable_plugins:
             self.requires("protobuf/3.21.12")
-        self.requires("clipper/6.4.2@ultimaker/cura_11622") # FIXME: use main after merge
+        self.requires("clipper/6.4.2@ultimaker/stable")
         self.requires("boost/1.83.0")
         self.requires("rapidjson/cci.20230929")
         self.requires("stb/cci.20230920")
         self.requires("spdlog/1.12.0")
         self.requires("fmt/10.2.1")
         self.requires("range-v3/0.12.0")
         self.requires("zlib/1.3.1")
-        self.requires("mapbox-wagyu/0.5.0@ultimaker/cura_11622") # FIXME: use main after merge
+        self.requires("mapbox-wagyu/0.5.0@ultimaker/stable")
 
     def generate(self):
         deps = CMakeDeps(self)