GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 23:56:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated branches in workflows

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-14 09:12:51 +02:00 committed by Jelle Spijker
parent 13167bf30b
commit 62ea4f3a48
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/conan-package.yml vendored
View File

@ -48,19 +48,19 @@ on:
jobs: jobs:
conan-recipe-version: conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
with: with:
project_name: cura project_name: cura
conan-package-export-macos: conan-package-export-macos:
needs: [ conan-recipe-version ] 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: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'macos-10.15' runs_on: 'macos-10.15'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -68,13 +68,13 @@ jobs:
conan-package-export-linux: conan-package-export-linux:
needs: [ conan-recipe-version ] 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: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'ubuntu-20.04' runs_on: 'ubuntu-20.04'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -82,13 +82,13 @@ jobs:
conan-package-export-windows: conan-package-export-windows:
needs: [ conan-recipe-version ] 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: with:
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
runs_on: 'windows-2022' runs_on: 'windows-2022'
python_version: '3.10.4' python_version: '3.10.x'
conan_config_branch: 'master' conan_config_branch: 'master'
conan_logging_level: 'info' conan_logging_level: 'info'
conan_export_binaries: true conan_export_binaries: true
@ -96,9 +96,9 @@ jobs:
notify-export: notify-export:
if: always() if: always()
needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ]
uses: ultimaker/cura/.github/workflows/notify.yml@5.1 uses: ultimaker/cura/.github/workflows/notify.yml@main
with: with:
success: ${{ contains(join(needs.*.result, ','), 'success') }} success: ${{ contains(join(needs.*.result, ','), 'success') }}
success_title: "New Conan recipe exported in ${{ github.repository }}" success_title: "New Conan recipe exported in ${{ github.repository }}"

2
.github/workflows/cura-installer.yml vendored
View File

@ -6,7 +6,7 @@ on:
cura_conan_version: cura_conan_version:
description: 'Cura Conan Version' description: 'Cura Conan Version'
# Fixme: default to cura/latest@testing (which is main) # Fixme: default to cura/latest@testing (which is main)
default: 'cura/latest@ultimaker/stable' default: 'cura/latest@ultimaker/main'
required: true required: true
conan_config: conan_config:
description: 'Conan config branch to use' description: 'Conan config branch to use'

2
.github/workflows/unit-test.yml vendored
View File

@ -62,7 +62,7 @@ env:
jobs: jobs:
conan-recipe-version: conan-recipe-version:
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
with: with:
project_name: cura project_name: cura