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 #144

Merged
merged 102 commits into from
Jul 13, 2022
Merged

5.1 #144

merged 102 commits into from
Jul 13, 2022

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Jul 8, 2022

See Ultimaker/Cura#12708 for a detailed comment

jellespijker and others added 30 commits April 26, 2022 15:20
# Conflicts:
#	.github/workflows/conan-package.yml
Contributes to CURA-9177
Contributes to CURA-9177
The same once used in CuraEngine

Contributes to CURA-9177
Contributes to CURA-9177
To test the clang-tidy Github Action

Contributes to CURA-9177
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Contributes to CURA-9177
Contributes to CURA-9177
Needed to set the MSVC flags with Conan
options are specific versions or to use the same version as conan.

Setting it like this assures that it is taken
into account when creating the has, making sure
everything links to the same version.

Contributes to CURA-9177
Using the cmake_layout on Windows is giving troubles
probably because it tries to be intelligent when it
detects Visual Studio.

Specifying the folder structure in the conanfile
gives a more reliable outcome over all tree systems

Contributes to CURA-9177
doing a conan install can generate
these files, these should never be
commited

Contributes to CURA-9177
Also added section about the Python module

Contributes to CURA-9177
This can cause confusion when compiling
SIP
This needs to be fixed after the merge to main

Contributes to CURA-9338
Contributes to CURA-9177 and CURA-9365
Contributes to CURA-9177 and CURA-9365
Contributes to CURA-9177 and CURA-9365
Contributes to CURA-9177 and CURA-9365
Contributes to CURA-9177 and CURA-9365
Contributes to CURA-9177 and CURA-9365
[email protected] and others added 17 commits June 22, 2022 11:36
Contributes to CURA-9365
Can only be used once merged to main

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
This should make sure that CPython builds on most systems.
Which allows it to be used to configure the python module
with CPython instead of the system provided one.

COntributes to CURA-9365
shared.

Contributes to CURA-9365
CPython needs to be compiled shared on Windows, but the sip wheel links against python3
Forcing the sipbuild tool to compile sip from source with: `pip install sip==6.5.1 --no-binary :all:`
doesn't work and fails: `LINK : fatal error LNK1104: cannot open file 'python3.lib'`
Due to time constrain leaving it to use the system python version. Since we're not linking against
the system library anyway and we only use it to generate the source code from the sip files

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
No longer needed.

Contributes to CURA-9365
Contributes to CURA-9365
once merged to main bump up the version in gitversion
and correct this

Contributes to CURA-9365
Contributes to CURA-9365
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


conan-package-export:
needs: [ conan-recipe-version ]
uses: ultimaker/cura/.github/workflows/[email protected]
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
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main

.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
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
@Joeydelarago Joeydelarago merged commit c547767 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.

4 participants