Skip to content

Commit

Permalink
Merge branch 'vectorgrp:main' into bgm_use_docker
Browse files Browse the repository at this point in the history
  • Loading branch information
MariusBgm authored Jul 9, 2024
2 parents 95f901e + 2da267a commit fcee3b8
Show file tree
Hide file tree
Showing 670 changed files with 26,837 additions and 14,056 deletions.
12 changes: 9 additions & 3 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@ AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: DontAlign
AlignOperands: true

AlignTrailingComments: false
# > clang-format-13, looks weird
# Kind: Leave
# OverEmptyLines: 2

AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortLambdasOnASingleLine: Empty
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
Expand Down Expand Up @@ -95,13 +100,14 @@ IncludeIsMainSourceRegex: ''
#IndentCaseBlocks: true
IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: AfterHash
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
#LambdaBodyIntdentation: Signature
#>clang-format-13
LambdaBodyIndentation: OuterScope
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
Expand Down
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[*.{cpp,ipp,hpp,h,c}]
indent_style = space
indent_size = 4
10 changes: 9 additions & 1 deletion .github/actions/build-cmake-preset/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ inputs:
description: "Run `cmake --target package` and upload artifact"
required: false
type: boolean
retention-days:
description: "How long we keep the artifacts"
required: false
type: number
default: 14
run-tests:
description: "Run tests"
required: false
Expand Down Expand Up @@ -68,7 +73,7 @@ runs:

- name: Setup host
if: runner.os == 'Linux'
run: sudo apt install -y ninja-build doxygen clang-12 llvm-12
run: sudo apt install -y ninja-build doxygen
id: setup-host-linux
shell: bash

Expand Down Expand Up @@ -108,6 +113,7 @@ runs:
with:
name: "${{ inputs.preset-name }}-test-results"
path: '_build/**/*gtestresults.xml'
retention-days: ${{ inputs.retention-days }}

- name: create cmake package for ${{ inputs.preset-name }}
if: ${{ inputs.do-package == 'true' }}
Expand All @@ -128,6 +134,7 @@ runs:
name: ${{ steps.cmake-package.outputs.package-name }}
path: ${{ steps.cmake-package.outputs.package-path }}
if-no-files-found: 'error'
retention-days: ${{ inputs.retention-days }}

- name: upload symbols package ${{ inputs.preset-name }}
if: ${{ inputs.do-package-symbols == 'true' }}
Expand All @@ -136,3 +143,4 @@ runs:
name: ${{ steps.cmake-package.outputs.symbols-package-name }}
path: ${{ steps.cmake-package.outputs.symbols-package-path}}
if-no-files-found: 'error'
retention-days: ${{ inputs.retention-days }}
59 changes: 22 additions & 37 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,32 @@ SPDX-FileCopyrightText: 2023 Vector Informatik GmbH
SPDX-License-Identifier: MIT
-->

## Developer checklist (address before review)

- [ ] Changelog.md updated
- [ ] Prepared update for depending repositories
- [ ] Documentation updated (public API changes only)
- [ ] API docstrings updated (public API changes only)

---

## Subject
What kind of changes does this pull request comprise?
<!--
- What kind of changes does this pull request comprise?
- Add a label like "Bugfix", "docs", etc. to this PR to give context.
-->

- [ ] Feature
- [ ] Bug fix
- [ ] Documentation update
- [ ] CI / build infrastructure
- [ ] other _(please specify below)_

## Description
_Either give a technical description what changed in this PR or use the text below_

Please read the Jira entry and the commit messages for a description of the changes of this PR

## Addressed Jira ticket(s)
_Which Jira tickets are addressed with this pull request (list all if multiple tickets are affected)_

## Review assignments

- [X] review code _(please specify in [Code review instructions](#code-review-instructions))_
- [ ] check new/modified tests (does it make sense? does it cover the functionality sufficiently?)
- [ ] run functional tests manually
- [ ] run specific setup (e.g., demos) _(please specify in [Testing instructions](#testing-instructions))_
- [ ] other _(please specify below)_

#### Code review instructions
_Which parts should be reviewed in detail? For example: content of console output, correct semantics of changes_
<!--
- Give a short summary of the intention of the changes.
- Don't replicate the commit messages here.
- Which Jira tickets are addressed with this pull request (list all if multiple tickets are affected)?
-->

#### Testing instructions (e.g., for specific setups)
_Test steps and test setup description. For example: which programs or configs to use_
## Instructions for review / testing
<!--
- Hilight some of the important changes, which reviewers should focus on
- Which parts should be reviewed in detail? For example: content of console output, correct semantics of changes
- Test steps and test setup description. For example: which programs or configs to use
-->

## Commit history check
## Developer checklist (address before review)

- [ ] Rebase &rarr; commit history clean
- [ ] Squash and merge &rarr; proper PR title
- [ ] Changelog.md updated
- [ ] Prepared update for depending repositories
- [ ] Documentation updated (public API changes only)
- [ ] API docstrings updated (public API changes only)
- [ ] Rebase &rarr; commit history clean
- [ ] Squash and merge &rarr; proper PR title
16 changes: 0 additions & 16 deletions .github/workflows/build-linux-asan.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/build-linux-featurebranch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'Linux Feature Branch Builds'
on:
workflow_dispatch:
inputs:
do_package:
required: true
type: boolean
default: true
do_package_symbols:
required: true
type: boolean
default: false
retention_days:
required: true
type: number
default: 14

jobs:
call_linux_build:
uses: ./.github/workflows/build-linux.yml
with:
do_package: ${{ inputs.do_package }}
retention_days: ${{ fromJSON(inputs.retention_days) }}

18 changes: 0 additions & 18 deletions .github/workflows/build-linux-tsan.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/build-linux-ubsan.yml

This file was deleted.

56 changes: 56 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: 'Linux Release Builds'
on:
workflow_call:
inputs:
do_package:
required: false
type: boolean
default: false
do_package_symbols:
required: false
type: boolean
default: false
retention_days:
required: false
type: number
default: 14
run_build:
required: true
type: boolean

jobs:
clang14-release:
name: Clang 14 release Builds for Ubuntu 22.04
environment: public-github-runners
runs-on: ubuntu-22.04
if: inputs.run_build == true
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang14-release
do-package: ${{ inputs.do_package }}
retention-days: ${{ inputs.retention_days }}

gcc-release:
name: GCC release Builds for Ubuntu 22.04
environment: public-github-runners
runs-on: ubuntu-latest
container:
image: ghcr.io/mariusbgm/sil-kit-ci-ubuntu-22.04:main
if: inputs.run_build == true
steps:
- name: git checkout
uses: actions/checkout@v1
with:
submodules: true
- name: GCC release build
uses: ./.github/actions/build-cmake-preset
id: build
with:
preset-name: linux-release
do-package: ${{ inputs.do_package }}
retention-days: ${{ env.retention_days }}

20 changes: 17 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
name: macOS build

on:
push:
branches: [ "main" ]
workflow_call:
inputs:
do_package:
required: false
type: boolean
default: false
do_package_symbols:
required: false
type: boolean
default: false
retention_days:
required: false
type: number
default: 14

jobs:
build-macos:
Expand All @@ -17,4 +29,6 @@ jobs:
- uses: ./.github/actions/build-cmake-preset
with:
preset-name: clang-release

do_package: ${{ inputs.do_package }}
do_package_symbols: ${{ inputs.do_package_symbols }}
retention_days: ${{ inputs.retention_days }}
7 changes: 5 additions & 2 deletions .github/workflows/build-release-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
environment: public-github-runners
runs-on: ubuntu-latest
container:
image: vectorgrp/sil-kit:ci-ubuntu-18.04
image: ghcr.io/mariusbgm/sil-kit-ci-ubuntu-18.04:main
outputs:
package-name: ${{ steps.build.outputs.package-name}}
steps:
Expand All @@ -30,7 +30,7 @@ jobs:
environment: public-github-runners
runs-on: ubuntu-latest
container:
image: vectorgrp/sil-kit:ci-ubuntu-18.04
image: ghcr.io/mariusbgm/sil-kit-ci-ubuntu-18.04:main
outputs:
package-name: ${{ steps.build.outputs.package-name}}
steps:
Expand All @@ -45,6 +45,7 @@ jobs:
preset-name: gcc8-debug
do-package: true
run-tests: false
upload-testlog: false
do-package-symbols: true

gcc8-package:
Expand Down Expand Up @@ -100,6 +101,7 @@ jobs:
do-package: true
do-package-symbols: true
run-tests: false
upload-testlog: false
toolset: 14.1
build-arch: x86

Expand Down Expand Up @@ -157,6 +159,7 @@ jobs:
do-package: true
do-package-symbols: true
run-tests: false
upload-testlog: false
toolset: 14.1
build-arch: x64

Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/build-win-featurebranch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Windows Feature Branch Builds'
on:
workflow_dispatch:
inputs:
do_package:
required: true
type: boolean
default: true
retention_days:
required: true
type: number
default: 14

jobs:
call_win_build:
uses: ./.github/workflows/build-win.yml
with:
do_package: ${{ inputs.do_package }}
retention_days: ${{ fromJSON(inputs.retention_days) }}

Loading

0 comments on commit fcee3b8

Please sign in to comment.