point to main

Ultimaker · Dec 8, 2023 · 86938ec · 86938ec
1 parent d6de186
commit 86938ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -33,44 +33,39 @@ on:
       - '[0-9]+.[0-9]+.[0-9]'
 
 jobs:
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   conan-recipe-version:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine_plugin_gradual_flow
 
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   conan-package-export:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
     secrets: inherit
 
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   conan-package-create-macos:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
 
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   conan-package-create-windows:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
 
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   conan-package-create-linux:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
diff --git a/.github/workflows/unit-test-post.yml b/.github/workflows/unit-test-post.yml
@@ -6,9 +6,8 @@ on:
     types: [ completed ]
 
 jobs:
-  # FIXME: Use `main` instead of `CURA-10831` once merged
   publish-test-results:
-    uses: ultimaker/cura-workflows/.github/workflows/unit-test-post.yml@CURA-10831
+    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
@@ -34,14 +34,13 @@ env:
   CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
 
 jobs:
-  # FIXME: Change to `main` instead of `CURA-10831` once merged
   conan-recipe-version:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine_plugin_gradual_flow
 
   testing:
-    uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/unit-test.yml@main
     needs: [ conan-recipe-version ]
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}