3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library

Browse source
This commit is contained in:
Jelle Spijker 2022-07-14 09:20:42 +02:00
commit 9cb8e4d742
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
31 changed files with 33 additions and 31 deletions
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:
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:
project_name: cura
conan-package-export-macos:
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 }}
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
@ -68,13 +68,13 @@ jobs:
conan-package-export-linux:
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 }}
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
@ -82,13 +82,13 @@ jobs:
conan-package-export-windows:
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 }}
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,9 +96,9 @@ 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@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 }}"

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)

4
.github/workflows/unit-test.yml vendored
View file

@ -62,7 +62,7 @@ env:
jobs:
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:
project_name: cura
@ -71,7 +71,7 @@ jobs:
needs: [ conan-recipe-version ]
steps:
- name: Checkout CuraEngine
- name: Checkout
uses: actions/checkout@v3
- name: Setup Python and pip