Prepare for merge

Ultimaker · Dec 4, 2024 · a359441 · a359441
1 parent 5a55f01
commit a359441
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -28,9 +28,8 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-# FIXME: use main once merged
       - name: Setup the build environment
-        uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@CURA-11622_conan_v2
+        uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
         with:
           conan_user: ${{ secrets.CONAN_USER }}
           conan_password: ${{ secrets.CONAN_PASS }}

diff --git a/recipes/clipper/all/conanfile.py b/recipes/clipper/all/conanfile.py
@@ -19,7 +19,7 @@ class ClipperConan(ConanFile):
     homepage = "http://www.angusj.com/delphi/clipper.php"
     settings = "os", "arch", "compiler", "build_type"
     package_type = "library"
-    python_requires = "sentrylibrary/1.0.0@ultimaker/cura_11622" # FIXME: use main after merge
+    python_requires = "sentrylibrary/1.0.0"
     python_requires_extend = "sentrylibrary.SentryLibrary"
 
     options = {