Update branch names

Co-authored-by: Casper Lamboo <[email protected]>
Ultimaker · Jul 13, 2022 · 59b7fe6 · 59b7fe6
1 parent 91edc29
commit 59b7fe6
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -47,13 +47,13 @@ on:
 
 jobs:
     conan-recipe-version:
-        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@5.1
+        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
         with:
             project_name: savitar
 
     conan-package-export:
         needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1
+        uses: ultimaker/cura/.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 }}
@@ -66,10 +66,10 @@ jobs:
 
     conan-package-create-macos:
         # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }}
+        if: ${{ (github.event_name == 'push' && github.ref_name == 'main')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }}
         needs: [ conan-recipe-version, conan-package-export ]
 
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@5.1
+        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             runs_on: 'macos-10.15'
@@ -80,10 +80,10 @@ jobs:
 
     conan-package-create-windows:
         # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }}
+        if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }}
         needs: [ conan-recipe-version, conan-package-export ]
 
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@5.1
+        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             runs_on: 'windows-2022'
@@ -94,10 +94,10 @@ jobs:
 
     conan-package-create-linux:
         # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }}
+        if: ${{ (github.event_name == 'push' && github.ref_name == 'main') || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }}
         needs: [ conan-recipe-version, conan-package-export ]
 
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@5.1
+        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             runs_on: 'ubuntu-20.04'
@@ -110,7 +110,7 @@ jobs:
         if: ${{ always() }}
         needs: [ conan-package-export ]
 
-        uses: ultimaker/cura/.github/workflows/notify.yml@5.1
+        uses: ultimaker/cura/.github/workflows/notify.yml@main
         with:
             success: ${{ contains(join(needs.*.result, ','), 'success') }}
             success_title: "New Conan recipe exported in ${{ github.repository }}"
@@ -121,10 +121,10 @@ jobs:
 
     notify-create:
         # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
+        if: ${{ always() && ((github.event_name == 'push' && github.ref_name == 'main') || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
         needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ]
 
-        uses: ultimaker/cura/.github/workflows/notify.yml@5.1
+        uses: ultimaker/cura/.github/workflows/notify.yml@main
         with:
             success: ${{ contains(join(needs.*.result, ','), 'success') }}
             success_title: "New binaries created in ${{ github.repository }}"