Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tereius committed Dec 20, 2024
2 parents b1f969d + f925d6d commit b418858
Show file tree
Hide file tree
Showing 53 changed files with 1,308 additions and 5,515 deletions.
92 changes: 0 additions & 92 deletions .azure-pipelines.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ IncludeCategories:
IncludeIsMainRegex: '(Test)?$'
IndentCaseLabels: true
IndentPPDirectives: None
IndentWidth: 1
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
Expand All @@ -90,12 +90,12 @@ PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
#RawStringFormats:
#RawStringFormats:
# - Delimiter: pb
# Language: TextProto
# BasedOnStyle: google
ReflowComments: true
SortIncludes: false
SortIncludes: true
SortUsingDeclarations: false
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: false
Expand All @@ -109,7 +109,7 @@ SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 1
TabWidth: 2
UseTab: ForIndentation
...

71 changes: 71 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: "Create Conan Package"
on: push

jobs:
build_linux_x86_64:
name: "Linux"
uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
with:
image: "ubuntu-20.04"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_windows_x86_64:
name: "Windows"
uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
with:
image: "windows-2022"
conan_host_profile: "windowsMinGW"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_macos_armv8:
name: "Macos"
uses: Privatehive/conan-workflows/.github/workflows/createPackage.yml@master
with:
image: "macos-14"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_android_x86:
name: "Android"
uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
with:
docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
machine_type: c2d-standard-8
conan_host_profile: "androidx86"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_android_x86_64:
name: "Android"
uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
with:
docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
machine_type: c2d-standard-8
conan_host_profile: "androidx86_64"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_android_armv7:
name: "Android"
uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
with:
docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
machine_type: c2d-standard-8
conan_host_profile: "androidArmv7"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

build_android_armv8:
name: "Android"
uses: Privatehive/conan-workflows/.github/workflows/createPackageGcpRunner.yml@master
with:
docker_image: "ghcr.io/privatehive/conan-ubuntu:latest"
machine_type: c2d-standard-8
conan_host_profile: "androidArmv8"
conan_remotes: https://conan.privatehive.de/artifactory/api/conan/public-conan

upload_recipe:
name: "Finalize"
uses: Privatehive/conan-workflows/.github/workflows/uploadRecipe.yml@master
needs: [ build_linux_x86_64, build_windows_x86_64, build_macos_armv8, build_android_x86, build_android_x86_64, build_android_armv7, build_android_armv8 ]
if: ${{ success() }}
secrets: inherit
with:
publish_property: ${{ github.ref == 'refs/heads/master' }}
conan_upload_remote: https://conan.privatehive.de/artifactory/api/conan/public-conan
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
CMakeUserPresets.json
build-*
.idea
# Created by https://www.toptal.com/developers/gitignore/api/vscode,clion,conan,qt
# Edit at https://www.toptal.com/developers/gitignore?templates=vscode,clion,conan,qt

Expand Down
Loading

0 comments on commit b418858

Please sign in to comment.