Skip to content

Commit

Permalink
Merge branch 'master' into hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
Duarte Fonseca authored and Duarte Fonseca committed Dec 9, 2024
2 parents c654804 + 6461369 commit b05ff33
Show file tree
Hide file tree
Showing 542 changed files with 22,636 additions and 24,665 deletions.
76 changes: 76 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Copyright (C) 2016 Olivier Goffart <[email protected]>
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.

# This is the clang-format configuration style to be used by Qt,
# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
# https://wiki.qt.io/Coding_Conventions

---
# Webkit style was loosely based on the Qt style
BasedOnStyle: WebKit

Standard: c++17

# Column width is limited to 100 in accordance with Qt Coding Style.
# https://wiki.qt.io/Qt_Coding_Style
# Note that this may be changed at some point in the future.
ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4

# We want a space between the type and the star for pointer types.
PointerAlignment: Left

# Align reference like PointerAlignment.
# ReferenceAlignment: Left

# We use template< without space.
SpaceAfterTemplateKeyword: false

# We want to break before the operators, but not before a '='.
BreakBeforeBinaryOperators: NonAssignment

# Braces are usually attached, but not after functions or class declarations.
BreakBeforeBraces: Attach

# When constructor initializers do not fit on one line, put them each on a new line.
# PackConstructorInitializers: CurrentLine

# Indent initializers by 4 spaces
ConstructorInitializerIndentWidth: 4

# Indent width for line continuations.
ContinuationIndentWidth: 8

# No spaces inside the braced list.
Cpp11BracedListStyle: true

# No indentation for namespaces.
NamespaceIndentation: None

# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125
IndentPPDirectives: None

# Horizontally align arguments after an open bracket.
# The coding style does not specify the following, but this is what gives
# results closest to the existing code.
AlignAfterOpenBracket: true
AlwaysBreakTemplateDeclarations: true

# Ideally we should also allow less short function in a single line, but
# clang-format does not handle that.
AllowShortFunctionsOnASingleLine: Inline

# The coding style specifies some include order categories, but also tells to
# separate categories with an empty line. It does not specify the order within
# the categories. Since the SortInclude feature of clang-format does not
# re-order includes separated by empty lines, the feature is not used.
SortIncludes: false

# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: AfterColon

# Do not format macro definition body.
SkipMacroDefinitionBody: true
86 changes: 46 additions & 40 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,67 @@ name: C/C++ CI

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
build_on_ubuntu_boost_183_gcc_x86:
runs-on: ubuntu-latest
steps:
- name: Ubuntu - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
id: ubuntu-gcc-1_83-x86
with:
boost_version: 1.83.0
platform_version: 20.04
boost_install_dir: /home/runner
toolset: gcc
arch: x86
cache: true

- uses: actions/checkout@v3

- name: install dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -y googletest asciidoc source-highlight doxygen graphviz
- name: Run CMake config
run: cmake -Bbuild -DBOOST_ROOT=/home/runner/boost/boost/ -DGTEST_ROOT=/usr/src/googletest/googletest/ -DCMAKE_INSTALL_PREFIX=${{ runner.workspace }}/install .

- name: Build CMake
run: cmake --build build -t all build_tests doc install

- uses: actions/upload-artifact@v2
with:
name: vsomeip
path: '${{ runner.workspace }}/install/**/*'
- name: Ubuntu - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
id: ubuntu-gcc-1_83-x86
with:
boost_version: 1.83.0
platform_version: 20.04
boost_install_dir: /home/runner
toolset: gcc
arch: x86
cache: true

- uses: actions/checkout@v4

- name: install dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -y googletest asciidoc source-highlight doxygen graphviz libbenchmark-dev
- name: Run CMake config
run: cmake -Bbuild -DBOOST_ROOT=/home/runner/boost/boost/ -DGTEST_ROOT=/usr/src/googletest

- name: Build CMake
run: cmake --build build --target build_tests

- name: Run Unit tests
run: ctest --test-dir build --tests-regex '^unit_' --verbose

- name: Run BenchMark tests
run: env -C build test/benchmark_tests/benchmark_tests_bin

- uses: actions/upload-artifact@v4
with:
name: vsomeip
path: "${{ runner.workspace }}/install/**/*"

build_on_windows_boost_183_gcc_x86:
runs-on: windows-latest
steps:
- name: Windows - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
id: windows-gcc-1_83-x86
with:
- name: Windows - Install boost 1.83.0 with gcc and x86
uses: MarkusJx/[email protected]
id: windows-gcc-1_83-x86
with:
boost_version: 1.83.0
platform: windows
boost_install_dir: C:\runner
toolset: msvc
arch: x86
cache: true

- uses: actions/checkout@v3

- name: Run CMake
run: cmake -Bbuild -D BOOST_ROOT=C:\runner\boost/boost\ .
- uses: actions/checkout@v4

- name: Run CMake
run: cmake -Bbuild -D BOOST_ROOT=C:\runner\boost/boost\ .

- name: Build CMake
run: cmake --build build
- name: Build CMake
run: cmake --build build
Loading

0 comments on commit b05ff33

Please sign in to comment.