Skip to content
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 97 commits into from
Jul 13, 2022
Merged

5.1 #1691

merged 97 commits into from
Jul 13, 2022

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Jul 8, 2022

See Ultimaker/Cura#12708 for all the PR's

Failing tests are unrelated to this PR

Integrating the new curaengine repo in our
cura-build-environment, proofed difficult
due to the way how we are passing compiler,
flags and settings in that repo. Since curaengine
relies on arcus and arcus is now a Conan
package it can't find the pre-compiled
binaries for those flags and settings.
Because curaengine can be build/used
separately from cura. The current plan
is to create a curaengine package. Which
will build binaries when pushed to main
but does a simple export-pkg on other branches
this should limit the amount of data to our
Artifactory server. Caching between pipeline
runs should further limit this.

The build artifacts are then collected in
cura-build-environment and installed in the
correct location in those scripts.

Contributes to CURA-9365
This commit should be reverted before the actual PR

Contributes to CURA-9365
This needs to be done for each job.

Contributes to CURA-9365
Contributes to CURA-9365
Superseded by .clang-format

Contributes to CURA-9365
Needed due to or lengthy versions

Contributes to CURA-9365
This should allow for uniform naming, versioning
and keep things maintainable

Contributes to CURA-9365
It might not work with reusable flows.

Contributes to CURA-9365
This is a workaround to allow further development of this Action
until we have the JFrog server up and running.

Contributes to CURA-9365
Ghostkeeper and others added 14 commits July 4, 2022 14:47
Maybe we should find the first non-empty path? Would become a lot more complex then though.

Contributes to issue CURA-9331.
Don't call the function to calculate the outlines for this layer twice. Also make the out for the exceptional state an early-out.

part of CURA-9225
…_on_empty

[CURA-9331] Check if all paths are empty in supposedly non-empty wall-path.
At least one negative layer, which can only happen when raft is active (and if a raft is active and a prime tower, the prime tower does start on the raft) was observed to happen at this point in one test. Probably goes wrong somewhere else, but can't hurt to apply some defensive programming here. (As it should just not happen.)

part of CURA-9225
Before this fix, the distance to the intersection was measured by the distance to the _line_ goint through some points A and C on the poly-like in question. However, only the _line-segment_ is of course on the poly-like, anything 'just' on the line could be very far indeed from the intended location. Luckily there was already a method that checks this, so it was just a question of swapping out the line method for the line-segment method. (As an aside: Note the parameter-ordering -- that has to be different between the two methods for some reason, since the method now used has the point in the middle instead of at the beginning?)

CURA-9425
@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2022

Unit Test Results

       1 files  +       1         1 suites  +1   1m 24s ⏱️ + 1m 24s
2 292 tests +2 292  2 062 ✔️ +2 062  5 💤 +5  225 +225 
2 293 runs  +2 293  2 063 ✔️ +2 063  5 💤 +5  225 +225 

For more details on these failures, see this check.

Results for commit b9cadd5. ± Comparison against base commit d370e55.

♻️ This comment has been updated with latest results.

jellespijker and others added 7 commits July 8, 2022 16:54
This only works for pr's against main for now.
A pr against a release branch will use the dependencies from alpha
[CURA-9425] Distance to moved point should be w.r.t. segment.
Use leaf settings in favor of `adhesion_extruder_nr`
branches:
- main
- 'CURA-*'
- '[1-9]+.[0-9]+'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- '[1-9]+.[0-9]+'
- '[0-9]+.[0-9]+'

.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
GitVersion.yml Outdated
is-mainline: false
pre-release-weight: 0
release:
regex: ^[\d].[\d]$
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
regex: ^[\d].[\d]$
regex: ^[0-9]+.[0-9]+$

Copy link
Contributor

@Joeydelarago Joeydelarago left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update branch names

.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
@Joeydelarago Joeydelarago merged commit 2b15a9d into main Jul 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants