-
-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from Ultimaker/5.1
5.1
- Loading branch information
Showing
51 changed files
with
725 additions
and
14,785 deletions.
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-*' | ||
- '[0-9]+.[0-9]+' | ||
tags: | ||
- '[0-9]+.[0-9]+.[0-9]+' | ||
|
||
|
||
jobs: | ||
conan-recipe-version: | ||
uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main | ||
with: | ||
project_name: savitar | ||
|
||
conan-package-export: | ||
needs: [ conan-recipe-version ] | ||
uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main | ||
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.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }} | ||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main | ||
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.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }} | ||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main | ||
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.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }} | ||
needs: [ conan-recipe-version, conan-package-export ] | ||
|
||
uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main | ||
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/notify.yml@main | ||
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.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }} | ||
needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ] | ||
|
||
uses: ultimaker/cura/.github/workflows/notify.yml@main | ||
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.