5.1

.clang-format

@@ -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

.clang-tidy

@@ -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 }

.gitattributes

@@ -0,0 +1,2 @@
+[auto]
+  crlf = false

.github/workflows/conan-package.yml

@@ -1,124 +1,133 @@
 ---
 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:
-  push:
-    paths:
-      - 'python/**'
-      - 'src/**'
-      - 'cmake/**'
-      - 'conanfile.py'
-      - 'CMakeLists.txt'
-      - '.github/workflows/conan-package.yml'
-    branches:
-      - main
-      - master
-      - dev
-      - 'CURA-*'
-      - 'release/**'
-      - '!15.*'
-      - '![1-4].[0-9]+'
-    tags:
-      - '![1-4].[0-9]+*'
-      - '!Arachne*'
-      - '!ancient*'
-      - '!jedi*'
-  pull_request:
-    branches:
-      - main
-      - master
-      - dev
-      - 'release/**'
-env:
-  CONAN_USER: ${{ secrets.CONAN_USER }}
-  CONAN_PASS: ${{ secrets.CONAN_PASS }}
+    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/**'
+            - 'python/**'
+            - 'test_package/**'
+            - 'pyarcus_include/**'
+            - 'cmake/**'
+            - 'acrus_include/**'
+            - 'conanfile.py'
+            - 'CMakeLists.txt'
+            - '.github/workflows/conan-package.yml'
+            - '.github/workflows/requirements*'
+            - 'GitVersion.yml'
+            - 'conandata.yml'
+            - '.gitattributes'
+        branches:
+            - main
+            - 'CURA-*'
+            - '[1-9]+.[0-9]+'
+        tags:
+            - '[1-9]+.[0-9]+.[0-9]+'
+
 jobs:
-  get-semver:
-    runs-on: ubuntu-20.04
-    outputs:
-      semver_full: ${{ steps.git-tool.outputs.fullSemVer }}
-      semver_majorminorpatch: ${{ steps.git-tool.outputs.MajorMinorPatch }}
-      user: ${{ steps.get-conan-broadcast-data.outputs.user }}
-      channel: ${{ steps.get-conan-broadcast-data.outputs.channel }}
-    steps:
-    - name: Checkout Arcus
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.head_ref }}
-        fetch-depth: 0
-    - name: Install GitVersion
-      uses: gittools/actions/gitversion/[email protected]
-      with:
-        versionSpec: '5.x'
-    - id: git-tool
-      name: GitTools
-      uses: gittools/actions/gitversion/[email protected]
-    - id: get-conan-broadcast-data
-      name: Get Conan broadcast data
-      run: |
-        echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-
-        if [ "${{ github.ref_name == 'master' || github.ref_name == 'main' }}" = "true" ]; then
-          echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-          echo '::set-output name=channel::stable'
-        elif [ "${{ startsWith(github.ref_name, 'release/') || steps.git-tool.outputs.fullSemVer == steps.git-tool.outputs.MajorMinorPatch }}" = "true" ]; then
-          echo '::set-output name=user::_'
-          echo '::set-output name=channel::_'
-        elif [ "${{ github.ref_name == 'dev' || github.event_name == 'pull_request' }}" = "true" ]; then
-          echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-          echo '::set-output name=channel::testing'
-        else
-          echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-          echo ${{ github.ref_name }} | awk '{print "::set-output name=channel::"substr(tolower($0),0,9)}'
-        fi
-  conan-package:
-    runs-on: ${{ matrix.os }}
-    needs: get-semver
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ macos-10.15, windows-2022, ubuntu-20.04 ]
-    steps:
-    - name: Checkout Arcus
-      uses: actions/checkout@v3
-    - name: Setup Python and pip
-      uses: actions/setup-python@v3
-      with:
-        python-version: '3.10.4'
-        architecture: 'x64'
-        cache: 'pip'
-    - name: Prepare Conan and sip-build (Bash)
-      if: ${{ runner.os != 'Windows' }}
-      run: |
-        pip install --require-hashes -r requirements.txt
-        conan config install https://github.com/Ultimaker/conan-config.git -a "-b CURA-9177_Fix_CI_CD" -tf $HOME/.conan
-        conan profile new default --detect
-        conan user -p $CONAN_PASS -r ultimaker $CONAN_USER
-    - name: Prepare Conan and sip-build (Powershell)
-      if: ${{ runner.os == 'Windows' }}
-      run: |
-        pip install --require-hashes -r requirements.txt
-        conan config install https://github.com/Ultimaker/conan-config.git -a "-b CURA-9177_Fix_CI_CD" -tf C:\Users\runneradmin\.conan
-        conan profile new default --detect
-        conan user -p $env:CONAN_PASS -r ultimaker $env:CONAN_USER
-    - name: Cache Conan local repository packages (Bash)
-      uses: actions/cache@v3
-      if: ${{ runner.os != 'Windows' }}
-      with:
-        path: |
-          $HOME/.conan/data
-        key: ${{ runner.os }}-conan
-    - name: Cache Conan local repository packages (Powershell)
-      uses: actions/cache@v3
-      if: ${{ runner.os == 'Windows' }}
-      with:
-        path: |
-          C:\Users\runneradmin\.conan\data
-          C:\.conan
-        key: ${{ runner.os }}-conan
-    - name: Create the Packages
-      run: conan create . arcus/${{ needs.get-semver.outputs.semver_full }}@${{ needs.get-semver.outputs.user }}/${{ needs.get-semver.outputs.channel }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update
-    - name: Create the latest alias
-      if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' )  || github.ref_name == 'dev' || needs.get-semver.outputs.semver_full == needs.get-semver.outputs.semver_majorminorpatch }}
-      run: conan alias arcus/latest@${{ needs.get-semver.outputs.user }}/${{ needs.get-semver.outputs.channel }} arcus/${{ needs.get-semver.outputs.semver_full }}@${{ needs.get-semver.outputs.user }}/${{ needs.get-semver.outputs.channel }}
-    - name: Upload the Package(s)
-      run: conan upload "*" -r ultimaker --all -c
+    conan-recipe-version:
+        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365
+        with:
+            project_name: arcus
+
+    conan-package-export:
+        needs: [ conan-recipe-version ]
+        uses: ultimaker/cura/.github/workflows/[email protected]
+        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) }}
+        needs: [ conan-recipe-version, conan-package-export ]
+
+        uses: ultimaker/cura/.github/workflows/[email protected]
+        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) }}
+        needs: [ conan-recipe-version, conan-package-export ]
+
+        uses: ultimaker/cura/.github/workflows/[email protected]
+        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) }}
+        needs: [ conan-recipe-version, conan-package-export ]
+
+        uses: ultimaker/cura/.github/workflows/[email protected]
+        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]
+        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)) }}
+        needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ]
+
+        uses: ultimaker/cura/.github/workflows/[email protected]
+        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

.github/workflows/requirements-conan-package.txt

@@ -0,0 +1,3 @@
+conan
+gitpython
+sip==6.5.1

.gitignore

@@ -74,3 +74,8 @@ nbproject/*
 /conanbuildinfo.txt
 /conaninfo.txt
 /graph_info.json
+/conan.lock
+/CMakeUserPresets.json
+/conanbuildinfo.txt
+/conaninfo.txt
+/graph_info.json