GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

various fixes to workflow

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-14 09:18:37 +02:00 committed by Jelle Spijker
parent 7dc378fb4c
commit b3cc3818b5
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ jobs:
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'
python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info'
conan_export_binaries: true
@ -74,7 +74,7 @@ jobs:
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'
python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info'
conan_export_binaries: true
@ -88,7 +88,7 @@ jobs:
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'
python_version: '3.10.x'
conan_config_branch: 'master'
conan_logging_level: 'info'
conan_export_binaries: true
@ -96,7 +96,7 @@ jobs:
notify-export:
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@main
with:

2
.github/workflows/conan-recipe-version.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
# FIXME: for when we push a tag (such as an release)
if is_tag:
branch_version = tools.Version("2.3.5")
branch_version = tools.Version("${{ github.ref_name }}")
else:
try:
branch_version = tools.Version(repo.active_branch.name)