Просмотр исходного кода

Update branches of Conan config files to 5.1

We'll want to have it test/build those next.

Contributes to issue CURA-9365.
Ghostkeeper 2 лет назад
Родитель
Сommit
585834970d
1 измененных файлов с 8 добавлено и 8 удалено
  1. 8 8
      .github/workflows/conan-package.yml

+ 8 - 8
.github/workflows/conan-package.yml

@@ -45,48 +45,48 @@ on:
 
 jobs:
     conan-recipe-version:
-        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365_fix_building_cura_main
+        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@5.1
         with:
             project_name: cura
 
     conan-package-export-macos:
         needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
             recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
             runs_on: 'macos-10.15'
             python_version: '3.10.4'
-            conan_config_branch: 'CURA-9177_Fix_CI_CD'
+            conan_config_branch: 'master'
             conan_logging_level: 'info'
             conan_export_binaries: true
         secrets: inherit
 
     conan-package-export-linux:
         needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
             recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
             runs_on: 'ubuntu-20.04'
             python_version: '3.10.4'
-            conan_config_branch: 'CURA-9177_Fix_CI_CD'
+            conan_config_branch: 'master'
             conan_logging_level: 'info'
             conan_export_binaries: true
         secrets: inherit
 
     conan-package-export-windows:
         needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
             recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
             runs_on: 'windows-2022'
             python_version: '3.10.4'
-            conan_config_branch: 'CURA-9177_Fix_CI_CD'
+            conan_config_branch: 'master'
             conan_logging_level: 'info'
             conan_export_binaries: true
         secrets: inherit
@@ -95,7 +95,7 @@ jobs:
         if: ${{ always() }}
         needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ]
 
-        uses: ultimaker/cura/.github/workflows/notify.yml@CURA-9365_fix_building_cura_main
+        uses: ultimaker/cura/.github/workflows/notify.yml@5.1
         with:
             success: ${{ contains(join(needs.*.result, ','), 'success') }}
             success_title: "New Conan recipe exported in ${{ github.repository }}"