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

Merged
merged 62 commits into from
Jul 13, 2022
Merged

5.1 #44

merged 62 commits into from
Jul 13, 2022

Conversation

jellespijker
Copy link
Member

See Ultimaker/Cura#12708 for the full overview

[email protected] and others added 30 commits June 7, 2022 16:41
Needed by the conan_toolchain.cmake in order
to determine MD(d)/MT(d) in the modenr cmake-way

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
We basically did this all ready. By using the
CMAKE_EXPORT_ALL_SYMBOLS instead of the generate
export headers we don't need to include the
generated export header file anymore

Contributes to CURA-9365
Contributes to CURA-9365
Not used by Savitar

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Should be removed after the merge

Contributes to CURA-9365
Hope this solves the missing vtable when building pySavitar on Mac

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
For more uniformity, consistency and maintainability

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
[email protected] and others added 16 commits June 22, 2022 09:03
Contributes to CURA-9365
Contributes to CURA-9365
The ensure that the recipe hash has the same result on Widows and unix

Contributes to CURA-9365
Contributes to CURA-9365
Contributes to CURA-9365
This should ensure that CPython is build with
default options, and that we can use it
for the sipbuildtool

Contributes to CURA-9365
Needed on Windows and can't hurt
on other systems

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
Contributes to CURA-9365
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
GitVersion.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
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


jobs:
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-version.yml@5.1
uses: ultimaker/cura/.github/workflows/conan-recipe-version.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
Co-authored-by: Casper Lamboo <[email protected]>
@Joeydelarago Joeydelarago merged commit 5a81f56 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