-
-
Notifications
You must be signed in to change notification settings - Fork 889
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
5.1 #1691
Merged
Merged
5.1 #1691
Changes from 95 commits
Commits
Show all changes
97 commits
Select commit
Hold shift + click to select a range
5e43302
Create or export a Conan package
jellespijker 2f5e81c
Only do the export on the Linux OS
jellespijker 3b6a528
Only export the recipe
jellespijker 5db09b8
Split up the export and create jobs
jellespijker dd9fff9
Also install conan config in export job
jellespijker 0ae39c7
Create package for this dev branch
jellespijker e0445a2
Checkout repo for conan-package-create job
jellespijker 338f9e9
Don't pack CMake test executables
jellespijker 224cbc7
Don't import dep dll's when packaging
jellespijker 74d8c6e
Use latest Arcus and build shared
jellespijker e8abfde
Add status of conan-package job to README.md
jellespijker dccec27
Only require protobuf when arcus is needed
jellespijker 97d7aa7
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker 483f1f4
Add GitVersion configuration
jellespijker 1aea6ae
Update ignore
jellespijker f6ed60f
Remove old clang-format file
jellespijker 2b8e75b
Use the latest arcus package
jellespijker 7fa5a79
Import dynamic libs for mac and windows to build dir
jellespijker 85e7a59
Also build latest for this dev branch
jellespijker 874d668
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker 51e8de1
Use short_paths on Windows
jellespijker 9ab4213
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker 6f8d355
Merge branch 'main' into CURA-9365_fix_building_cura_main
jellespijker 750c26b
Use the reusable workflows defined in Cura repo
jellespijker b074011
Use the correct name for the conan-package-create flow
jellespijker c1fd709
Point to correct branch
jellespijker a0ffdf1
Use needs to obtain output of previous job
jellespijker 6b1b017
Don't use strategy
jellespijker 3cd1c65
Allow for a bool to only build from local cache
jellespijker 431cd12
Revert "Allow for a bool to only build from local cache"
jellespijker 3487fc4
Notify about the status of the creation of package
jellespijker 6f38e68
inherit secrets
jellespijker 295cf08
Add importg manifest to ignore
jellespijker 5200ed0
Use conandata for requirements
jellespijker b814325
Use semver compatible range modifier
jellespijker 5e5e49a
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building…
jellespijker c2d3723
Use system build tools
jellespijker f3a4bfe
Use UMBaseConanfile for recipe
jellespijker f473330
Fix typo
jellespijker 2a39039
Also run on release branch
jellespijker e6e7d06
Uniform versioning
jellespijker 6ce1f49
Use umbase 0.1.1 or higher
jellespijker bf1209f
add prereleasetag number
jellespijker ee14d38
Trigger when conandata is changed
jellespijker a7ff72e
pin umbase version
jellespijker efb071f
Fix unit-testing
jellespijker 5b395eb
Always download conan config
jellespijker b0a351e
Needs to get the version first
jellespijker 8783944
Upload conan binaries to cura repo
jellespijker 8c62e8f
Point to -alpha
jellespijker 3419624
Use latest
jellespijker c8b8404
Sync workflow across repo
jellespijker de1cf1c
Copy the curaengine to the bin directy for Mac&Linux
casperlamboo 47946b9
only build clipper, arcus and protobuf shared
jellespijker ffdc7b5
Use full specified type
jellespijker 1019395
Also compile curaengine on this branch
jellespijker f1aef58
Don't fill gaps more than once when using gradual infill
Ghostkeeper f4e9434
Fixed elsewhere.
rburema ef7715b
Merge pull request #1685 from Ultimaker/CURA-9295_dont_double_fill_in…
rburema eb710b2
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building…
jellespijker 4b5ed89
Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main…
jellespijker 92c777c
Use zlib 1.2.12
jellespijker c6a73ec
small fixes
jellespijker 3861b1c
Fix for negative indices.
rburema 506f856
Copy CuraEngine executable to package_folder
jellespijker 7f7c021
Print prime-tower part of the raft first.
rburema 58ff9e3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1
Ghostkeeper c154e85
Switch workflows to use 5.1 branches, and Conan config master
Ghostkeeper 925f940
Always print prime-tower raft if prime-tower is enabled.
rburema 02cbe41
Raft-extruder isn't nescesarily the adhesion extruder anymore.
rburema 79daca2
Don't print 'all same extruder' prime raft without prime tower.
rburema f423267
Also guarantee convecity of model part of raft if required.
rburema 36bad69
Check if all paths are empty in supposedly non-empty wall-path.
rburema 819d09e
Expand check for empty paths
Ghostkeeper 6c2ba16
Apply suggestions from code review.
rburema b16c5f0
Revert "Raft-extruder isn't nescesarily the adhesion extruder anymore."
rburema c187b78
The same, but refactored to be more efficient.
rburema 5bd6636
Merge pull request #1688 from Ultimaker/CURA-9331_fix_randomize_start…
rburema d38b1d7
Defensive coding to prevent raft intersection.
rburema 48a7f34
Merge pull request #1687 from Ultimaker/CURA-9225_prime_for_raft
casperlamboo 408e693
Update unit-test workflow for new build flow
jellespijker 70035c5
Update unit-test workflow for new build flow
jellespijker 7cf5f47
Specify Release as build_type
jellespijker a20b11b
Switched order of cmake args
jellespijker f16c329
Protobug is not needed in build context
jellespijker 57109b9
use cmake --build
jellespijker 2bfdef9
Distance to moved point should be w.r.t. segment.
rburema a478bf0
Add pull request to gitversion
jellespijker 3a73dd4
Use workflows from Cura branch CURA-9365
jellespijker adecda5
Use leaf settings in favor of `adhesion_extruder_nr`
casperlamboo 0bb0084
Merge pull request #1690 from Ultimaker/CURA-9425_fix_simplify_spiralize
jellespijker b160509
Fix out of bounds in spiralize
Ghostkeeper 3bcea00
Use new versioning reusable workflow
jellespijker 12fe07e
Merge pull request #1693 from Ultimaker/CURA-9383
Joeydelarago e2b0eb7
Fix version number matching
casperlamboo b9cadd5
Delete GitVersion.yml
casperlamboo ee3670f
Apply suggestions from code review
Joeydelarago File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,128 @@ | ||
--- | ||
name: conan-package | ||
|
||
# Exports the recipe, sources and binaries for Mac, Windows and Linux and upload these to the server such that these can | ||
# be used downstream. | ||
# | ||
# It should run on pushes against main or CURA-* branches, but it will only create the binaries for main and release branches | ||
|
||
on: | ||
workflow_dispatch: | ||
inputs: | ||
create_binaries_windows: | ||
required: true | ||
default: false | ||
description: 'create binaries Windows' | ||
create_binaries_linux: | ||
required: true | ||
default: false | ||
description: 'create binaries Linux' | ||
create_binaries_macos: | ||
required: true | ||
default: false | ||
description: 'create binaries Macos' | ||
|
||
push: | ||
paths: | ||
- 'src/**' | ||
- 'cmake/**' | ||
- 'tests/**' | ||
- 'conanfile.py' | ||
- 'conandata.yml' | ||
- 'CMakeLists.txt' | ||
- '.github/workflows/conan-package.yml' | ||
- '.github/worflows/requirements-conan-package.txt' | ||
branches: | ||
- main | ||
- 'CURA-*' | ||
- '[1-9]+.[0-9]+' | ||
tags: | ||
- '[0-9]+.[0-9]+.[0-9]+' | ||
|
||
jobs: | ||
conan-recipe-version: | ||
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
project_name: curaengine | ||
|
||
conan-package-export: | ||
needs: [ conan-recipe-version ] | ||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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: 'master' | ||
conan_logging_level: 'info' | ||
secrets: inherit | ||
|
||
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.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }} | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} | ||
runs_on: 'macos-10.15' | ||
python_version: '3.10.4' | ||
conan_config_branch: 'master' | ||
conan_logging_level: 'info' | ||
secrets: inherit | ||
|
||
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) }} | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} | ||
runs_on: 'windows-2022' | ||
python_version: '3.10.4' | ||
conan_config_branch: 'master' | ||
conan_logging_level: 'info' | ||
secrets: inherit | ||
|
||
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) }} | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} | ||
runs_on: 'ubuntu-20.04' | ||
python_version: '3.10.4' | ||
conan_config_branch: 'master' | ||
conan_logging_level: 'info' | ||
secrets: inherit | ||
|
||
notify-export: | ||
if: ${{ always() }} | ||
needs: [ conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
success: ${{ contains(join(needs.*.result, ','), 'success') }} | ||
success_title: "New Conan recipe exported in ${{ github.repository }}" | ||
success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" | ||
failure_title: "Failed to export Conan Export in ${{ github.repository }}" | ||
failure_body: "Failed to exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" | ||
secrets: inherit | ||
|
||
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)) }} | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ] | ||
|
||
uses: ultimaker/cura/.github/workflows/[email protected] | ||
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||
with: | ||
success: ${{ contains(join(needs.*.result, ','), 'success') }} | ||
success_title: "New binaries created in ${{ github.repository }}" | ||
success_body: "Created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" | ||
failure_title: "Failed to create binaries in ${{ github.repository }}" | ||
failure_body: "Failed to created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}" | ||
secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
conan | ||
gitpython | ||
sip==6.5.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,55 @@ | ||||||
mode: ContinuousDelivery | ||||||
next-version: 5.1 | ||||||
branches: | ||||||
main: | ||||||
regex: ^main$ | ||||||
mode: ContinuousDelivery | ||||||
tag: alpha | ||||||
increment: None | ||||||
prevent-increment-of-merged-branch-version: true | ||||||
track-merge-target: false | ||||||
source-branches: [ ] | ||||||
tracks-release-branches: false | ||||||
is-release-branch: false | ||||||
is-mainline: true | ||||||
pre-release-weight: 55000 | ||||||
develop: | ||||||
regex: ^CURA-.*$ | ||||||
mode: ContinuousDelivery | ||||||
tag: alpha | ||||||
increment: None | ||||||
prevent-increment-of-merged-branch-version: false | ||||||
track-merge-target: true | ||||||
source-branches: [ 'main' ] | ||||||
tracks-release-branches: true | ||||||
is-release-branch: false | ||||||
is-mainline: false | ||||||
pre-release-weight: 0 | ||||||
release: | ||||||
regex: ^[\d].[\d]$ | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
mode: ContinuousDelivery | ||||||
tag: beta | ||||||
increment: None | ||||||
prevent-increment-of-merged-branch-version: true | ||||||
track-merge-target: false | ||||||
source-branches: [ 'main' ] | ||||||
tracks-release-branches: false | ||||||
is-release-branch: true | ||||||
is-mainline: false | ||||||
pre-release-weight: 30000 | ||||||
pull-request-main: | ||||||
regex: ^(pull|pull\-requests|pr)[/-] | ||||||
mode: ContinuousDelivery | ||||||
tag: alpha+ | ||||||
increment: Inherit | ||||||
prevent-increment-of-merged-branch-version: true | ||||||
tag-number-pattern: '[/-](?<number>\d+)[-/]' | ||||||
track-merge-target: true | ||||||
source-branches: [ 'main' ] | ||||||
tracks-release-branches: false | ||||||
is-release-branch: false | ||||||
is-mainline: false | ||||||
pre-release-weight: 30000 | ||||||
ignore: | ||||||
sha: [ ] | ||||||
merge-message-formats: { } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.