-
-
Notifications
You must be signed in to change notification settings - Fork 27
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
5.1 #44
Changes from 58 commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
3249b2c
Set cmake policy for compiler flags MSVC to new
37cd0a6
Moved headers to a seperate folder
9c9de23
Add clang tools
f520a8c
Manage deps with conan
c22bb1e
Add a conan package workflow
4e50835
Use export all symbols on Windows
19d833a
Use the same CMake build modules as Arcus
8d35016
Map the headers in the conan layout
bb6a1bd
Don't require system lib threads
311bbf5
Remove old docker script
7206c89
Add cmake files to gitignore
jellespijker 651fe77
Also trigger workflow on include
97c0f1c
trigger workflow on this dev branch
27dc0d8
Also us the include namespace in the header file
37856f8
Set the rpaths the old fassion way
ee79152
Skip rpaths on Mac
44d07b8
Remove options from cmake that moved to conan
casperlamboo a5c95a4
Set prefix path for non Windows OS'es
casperlamboo fd23641
Use reusable workflows
1714f70
Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main…
jellespijker e29ab57
Remove old requirements.txt
265c98e
Inherit secrets
f659b47
Added conan package requirements
30a722f
Use conandata for requirements
85b1188
Make sure that linking against the correct Python lib
421e8be
Use system build tools
2a25ebd
Use UMBaseConanfile
e527890
Use cpp_info
e237074
Use Conan CPython recipe
0aab03b
Cleanup of recipe
cdd09d4
CMake generator is now specified in global.conf
ff82b8f
call the find_package correctly
a1287b4
Use cpython 3.10.4
b17cec5
Use the conan sipbuildtool
61626e2
Add supplemental files for sipbuildtool
9b91e38
Use cpython without user/channel
fc4e4c2
set config of deps for windows
ba0ce1c
Clean local Conan Cache
9783746
pass boolean
2c6316b
Uniform versioning
91b9926
Use umbase 0.1.1 or greater
dea6a2f
pin umbase to 0.1.1
c28c9b8
use mpdecimal 2.5.0
35a42a9
Trigger workflow on changes to conandata
aa4f2b3
Uniform line ending across OSes
jellespijker 741ef0e
Trigger on change in gitattributes
8a31da3
Add manual trigger
70f9e8f
Don't run on PR
5c7e3a5
Don't notify when binaries aren't supposed to build
d327f5f
Only build pugixml shared
9a1b8ee
Use shared CPython
884dd3d
Use system Python to generate source from sip on windows
758c660
use lib_paths for full path
68f9620
Change Conan workflow to use 5.1 and Conan config master
Ghostkeeper c039ff9
Use sys.executable
25c0b25
Update README.md
370ac1a
Use new versioning reusable workflow
6f08fa5
Also trigger when requirements* from runner change
e31c1e7
Fix version number matching
casperlamboo a32d280
Fix version number matching
casperlamboo 91edc29
Delete GitVersion.yml
casperlamboo 59b7fe6
Update branch names
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,98 @@ | ||
AccessModifierOffset: -2 | ||
AlignAfterOpenBracket: Align | ||
AlignConsecutiveAssignments: None | ||
AlignConsecutiveDeclarations: None | ||
AlignEscapedNewlines: Left | ||
AlignOperands: AlignAfterOperator | ||
AlignTrailingComments: false | ||
AllowAllParametersOfDeclarationOnNextLine: false | ||
AllowShortBlocksOnASingleLine: Never | ||
AllowShortCaseLabelsOnASingleLine: false | ||
AllowShortFunctionsOnASingleLine: None | ||
AllowShortIfStatementsOnASingleLine: Never | ||
AllowShortLoopsOnASingleLine: true | ||
AlwaysBreakAfterDefinitionReturnType: None | ||
AlwaysBreakAfterReturnType: None | ||
AlwaysBreakBeforeMultilineStrings: true | ||
AlwaysBreakTemplateDeclarations: Yes | ||
BinPackArguments: false | ||
BinPackParameters: false | ||
BraceWrapping: | ||
AfterClass: true | ||
AfterControlStatement: Always | ||
AfterEnum: false | ||
AfterFunction: true | ||
AfterNamespace: true | ||
AfterObjCDeclaration: false | ||
AfterStruct: true | ||
AfterUnion: true | ||
BeforeCatch: true | ||
BeforeElse: true | ||
IndentBraces: false | ||
SplitEmptyFunction: true | ||
SplitEmptyNamespace: true | ||
SplitEmptyRecord: true | ||
BreakAfterJavaFieldAnnotations: true | ||
BreakBeforeBinaryOperators: NonAssignment | ||
BreakBeforeBraces: Allman | ||
BreakBeforeInheritanceComma: true | ||
BreakBeforeTernaryOperators: true | ||
BreakConstructorInitializers: BeforeColon | ||
BreakConstructorInitializersBeforeComma: false | ||
BreakStringLiterals: true | ||
ColumnLimit: 140 | ||
CommentPragmas: '^ IWYU pragma:' | ||
CompactNamespaces: false | ||
ConstructorInitializerAllOnOneLineOrOnePerLine: false | ||
ConstructorInitializerIndentWidth: 2 | ||
ContinuationIndentWidth: 2 | ||
Cpp11BracedListStyle: false | ||
DerivePointerAlignment: false | ||
PointerAlignment: Left | ||
DisableFormat: false | ||
ExperimentalAutoDetectBinPacking: true | ||
FixNamespaceComments: true | ||
ForEachMacros: | ||
- foreach | ||
- Q_FOREACH | ||
- BOOST_FOREACH | ||
IncludeCategories: | ||
- Priority: 2 | ||
Regex: ^"(llvm|llvm-c|clang|clang-c)/ | ||
- Priority: 3 | ||
Regex: ^(<|"(gtest|gmock|isl|json)/) | ||
- Priority: 1 | ||
Regex: .* | ||
IncludeIsMainRegex: (Test)?$ | ||
IndentCaseLabels: false | ||
IndentWidth: 4 | ||
IndentWrappedFunctionNames: true | ||
JavaScriptQuotes: Double | ||
JavaScriptWrapImports: true | ||
KeepEmptyLinesAtTheStartOfBlocks: true | ||
Language: Cpp | ||
MacroBlockBegin: '' | ||
MacroBlockEnd: '' | ||
MaxEmptyLinesToKeep: 2 | ||
NamespaceIndentation: None | ||
ObjCBlockIndentWidth: 7 | ||
ObjCSpaceAfterProperty: true | ||
ObjCSpaceBeforeProtocolList: false | ||
ReflowComments: true | ||
SortIncludes: CaseSensitive | ||
SortUsingDeclarations: true | ||
SpaceAfterCStyleCast: false | ||
SpaceAfterLogicalNot: true | ||
SpaceAfterTemplateKeyword: false | ||
SpaceBeforeAssignmentOperators: true | ||
SpaceBeforeParens: ControlStatements | ||
SpaceInEmptyParentheses: false | ||
SpacesBeforeTrailingComments: 1 | ||
SpacesInAngles: false | ||
SpacesInCStyleCastParentheses: false | ||
SpacesInContainerLiterals: true | ||
SpacesInParentheses: false | ||
SpacesInSquareBrackets: false | ||
Standard: c++17 | ||
TabWidth: 4 | ||
UseTab: Never |
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,14 @@ | ||
--- | ||
Checks: '*, -llvmlibc-*, -modernize-use-trailing-return-type, -altera-unroll-loops*, -readability-avoid-const-params-in-decls, -fuchsia-default-arguments-calls' | ||
WarningsAsErrors: '-*' | ||
HeaderFilterRegex: '' | ||
FormatStyle: none | ||
CheckOptions: | ||
- { key: readability-identifier-naming.NamespaceCase, value: lower_case } | ||
- { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE } | ||
- { key: readability-identifier-naming.ClassCase, value: CamelCase } | ||
- { key: readability-identifier-naming.FunctionCase, value: camelBack } | ||
- { key: readability-identifier-naming.MethodCase, value: camelBack } | ||
- { key: readability-identifier-naming.ParameterCase, value: lower_case } | ||
- { key: readability-identifier-naming.VariableCase, value: lower_case } | ||
- { key: readability-identifier-naming.ClassConstantCase, value: UPPER_CASE } |
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,2 @@ | ||
[auto] | ||
crlf = false |
This file was deleted.
Oops, something went wrong.
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,134 @@ | ||||||
--- | ||||||
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/**' | ||||||
- 'include/**' | ||||||
- 'python/**' | ||||||
- 'test_package/**' | ||||||
- 'tests/**' | ||||||
- 'cmake/**' | ||||||
- 'conanfile.py' | ||||||
- 'CMakeLists.txt' | ||||||
- '.github/workflows/conan-package.yml' | ||||||
- '.github/workflows/requirements*' | ||||||
- 'GitVersion.yml' | ||||||
- 'conandata.yml' | ||||||
- '.gitattributes' | ||||||
branches: | ||||||
- main | ||||||
- 'CURA-*' | ||||||
- '[1-9]+.[0-9]+' | ||||||
casperlamboo marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
tags: | ||||||
- '[1-9]+.[0-9]+.[0-9]+' | ||||||
casperlamboo marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
|
||||||
|
||||||
jobs: | ||||||
conan-recipe-version: | ||||||
uses: ultimaker/cura/.github/workflows/[email protected] | ||||||
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
Joeydelarago marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
with: | ||||||
project_name: savitar | ||||||
|
||||||
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.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 | ||
sip==6.5.1 | ||
gitpython |
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.