Skip to content

Commit cb2dd77

Browse files
Merge pull request #18 from NikolasK-source/main
update to 1.4.0
2 parents bde5f92 + 1cb9145 commit cb2dd77

40 files changed

+3105
-1328
lines changed

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AllowAllConstructorInitializersOnNextLine: 'true'
1212
AllowAllParametersOfDeclarationOnNextLine: 'true'
1313
AllowShortBlocksOnASingleLine: 'true'
1414
AllowShortCaseLabelsOnASingleLine: 'true'
15-
AllowShortFunctionsOnASingleLine: All
15+
AllowShortFunctionsOnASingleLine: InlineOnly
1616
AllowShortIfStatementsOnASingleLine: Always
1717
AllowShortLambdasOnASingleLine: All
1818
AlwaysBreakAfterReturnType: None
@@ -48,4 +48,4 @@ SpacesInAngles: 'false'
4848
SpacesInCStyleCastParentheses: 'false'
4949
Standard: Cpp11
5050
TabWidth: '4'
51-
UseTab: Never
51+
UseTab: Never

.clang-tidy

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
Checks: 'bugprone-*,
2+
cert-dcl21-cpp,
3+
cert-dcl58-cpp,
4+
cert-err34-c,
5+
cert-err52-cpp,
6+
cert-err60-cpp,
7+
cert-flp30-c,
8+
cert-msc50-cpp,
9+
cert-msc51-cpp,
10+
cert-str34-c,
11+
cppcoreguidelines-*,
12+
clang-analyzer-*,
13+
google-default-arguments,
14+
google-explicit-constructor,
15+
google-runtime-operator,
16+
hicpp-exception-baseclass,
17+
hicpp-multiway-paths-covered,
18+
misc-misplaced-const,
19+
misc-new-delete-overloads,
20+
misc-no-recursion,
21+
misc-non-copyable-objects,
22+
misc-throw-by-value-catch-by-reference,
23+
misc-unconventional-assign-operator,
24+
misc-uniqueptr-reset-release,
25+
modernize-*,
26+
mpi-buffer-deref,
27+
mpi-type-mismatch,
28+
openmp-use-default-none,
29+
portability-*,
30+
performance-*,
31+
readability-avoid-const-params-in-decls,
32+
readability-const-return-type,
33+
readability-container-size-empty,
34+
readability-convert-member-functions-to-static,
35+
readability-delete-null-pointer,
36+
readability-deleted-default,
37+
readability-inconsistent-declaration-parameter-name,
38+
readability-make-member-function-const,
39+
readability-misleading-indentation,
40+
readability-misplaced-array-index,
41+
readability-non-const-parameter,
42+
readability-redundant-control-flow,
43+
readability-redundant-declaration,
44+
readability-redundant-function-ptr-dereference,
45+
readability-redundant-smartptr-get,
46+
readability-redundant-string-cstr,
47+
readability-redundant-string-init,
48+
readability-simplify-subscript-expr,
49+
readability-static-accessed-through-instance,
50+
readability-static-definition-in-anonymous-namespace,
51+
readability-string-compare,
52+
readability-uniqueptr-delete-release,
53+
readability-use-anyofallof
54+
-modernize-use-trailing-return-type
55+
-bugprone-exception-escape'
56+
WarningsAsErrors: '*,
57+
-modernize-*,
58+
-readability-*
59+
-cppcoreguidelines-avoid-magic-numbers,
60+
-cppcoreguidelines-pro-type-vararg'
61+
HeaderFilterRegex: ''

.clang-tidy-noerrors

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
Checks: 'bugprone-*,
2+
cert-dcl21-cpp,
3+
cert-dcl58-cpp,
4+
cert-err34-c,
5+
cert-err52-cpp,
6+
cert-err60-cpp,
7+
cert-flp30-c,
8+
cert-msc50-cpp,
9+
cert-msc51-cpp,
10+
cert-str34-c,
11+
cppcoreguidelines-*,
12+
clang-analyzer-*,
13+
google-default-arguments,
14+
google-explicit-constructor,
15+
google-runtime-operator,
16+
hicpp-exception-baseclass,
17+
hicpp-multiway-paths-covered,
18+
misc-misplaced-const,
19+
misc-new-delete-overloads,
20+
misc-no-recursion,
21+
misc-non-copyable-objects,
22+
misc-throw-by-value-catch-by-reference,
23+
misc-unconventional-assign-operator,
24+
misc-uniqueptr-reset-release,
25+
modernize-*,
26+
mpi-buffer-deref,
27+
mpi-type-mismatch,
28+
openmp-use-default-none,
29+
portability-*,
30+
performance-*,
31+
readability-avoid-const-params-in-decls,
32+
readability-const-return-type,
33+
readability-container-size-empty,
34+
readability-convert-member-functions-to-static,
35+
readability-delete-null-pointer,
36+
readability-deleted-default,
37+
readability-inconsistent-declaration-parameter-name,
38+
readability-make-member-function-const,
39+
readability-misleading-indentation,
40+
readability-misplaced-array-index,
41+
readability-non-const-parameter,
42+
readability-redundant-control-flow,
43+
readability-redundant-declaration,
44+
readability-redundant-function-ptr-dereference,
45+
readability-redundant-smartptr-get,
46+
readability-redundant-string-cstr,
47+
readability-redundant-string-init,
48+
readability-simplify-subscript-expr,
49+
readability-static-accessed-through-instance,
50+
readability-static-definition-in-anonymous-namespace,
51+
readability-string-compare,
52+
readability-uniqueptr-delete-release,
53+
readability-use-anyofallof
54+
-modernize-use-trailing-return-type
55+
-bugprone-exception-escape'
56+
WarningsAsErrors: ''
57+
HeaderFilterRegex: ''

.github/workflows/clang-format.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ jobs:
44
formatting-check:
55
name: Formatting Check
66
runs-on: ubuntu-latest
7+
strategy:
8+
matrix:
9+
path:
10+
- 'src'
11+
- 'test'
712
steps:
8-
- uses: actions/checkout@v2
9-
- name: Run clang-format style check for C/C++/Protobuf programs.
10-
uses: jidicula/clang-format-action@v4.8.0
11-
with:
12-
clang-format-version: '14'
13-
check-path: 'src'
14-
13+
- uses: actions/checkout@v2
14+
- name: Run clang-format style check for C/C++/Protobuf programs.
15+
uses: jidicula/clang-format-action@v4.8.0
16+
with:
17+
clang-format-version: '14'
18+
check-path: ${{ matrix.path }}
19+

.github/workflows/cmake.yml

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: CMake
22

3-
on:
4-
[push, pull_request ]
3+
on: [push, pull_request]
54

65
env:
76
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -23,10 +22,48 @@ jobs:
2322
- name: Update submodules
2423
run: git submodule update
2524

25+
- name: create tmp dir
26+
run: mkdir tmp
27+
28+
- name: update
29+
run: |
30+
sudo apt update
31+
sudo apt upgrade -y
32+
33+
- name: install cxxopts
34+
run: |
35+
git clone https://github.com/jarro2783/cxxopts.git tmp/cxxopts
36+
cd tmp/cxxopts
37+
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
38+
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
39+
cmake --build build
40+
sudo cmake --install build
41+
cd -
42+
43+
- name: install cxxshm
44+
run: |
45+
git clone https://github.com/NikolasK-source/cxxshm.git tmp/cxxshm
46+
cd tmp/cxxshm
47+
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
48+
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
49+
cmake --build build
50+
sudo cmake --install build
51+
cd -
52+
53+
- name: install cxxsemaphore
54+
run: |
55+
git clone https://github.com/NikolasK-source/cxxsemaphore.git tmp/cxxsemaphore
56+
cd tmp/cxxsemaphore
57+
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
58+
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
59+
cmake --build build
60+
sudo cmake --install build
61+
cd -
62+
2663
- name: Configure CMake
2764
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
2865
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
29-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF
66+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF -DBUILD_DOC=OFF
3067

3168
- name: Build
3269
# Build your program with the given configuration
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
on:
2-
push:
3-
branches: [ "main", "development" ]
4-
pull_request:
2+
[ push, pull_request ]
53
name: Flatpak_test
64
jobs:
75
flatpak:
86
name: "Flatpak"
97
runs-on: ubuntu-latest
108
container:
11-
image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
9+
image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
1210
options: --privileged
1311
steps:
1412
- uses: actions/checkout@v2
@@ -22,9 +20,9 @@ jobs:
2220
- name: Update submodules
2321
run: git submodule update
2422

25-
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
23+
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
2624
name: "Build"
2725
with:
2826
bundle: test_stdin-to-modbus-shm.flatpak
2927
manifest-path: network.koesling.test-stdin-to-modbus-shm.yml
30-
cache-key: flatpak-builder-${{ github.sha }}
28+
cache-key: flatpak-builder-${{ github.sha }}

.github/workflows/flatpak_release.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# general
22
build*
33
docs/*
4+
docs_doxy
45

56
!docs/index.md
67
!docs/_config.yml

.gitmodules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
[submodule "libs/cxxopts"]
2-
path = libs/cxxopts
3-
url = https://github.com/NikolasK-source/cxxopts.git
4-
[submodule "libs/cxxshm"]
5-
path = libs/cxxshm
6-
url = https://github.com/NikolasK-source/cxxshm.git
71
[submodule "libs/cxxendian"]
82
path = libs/cxxendian
93
url = https://github.com/NikolasK-source/cxxendian.git
10-
[submodule "libs/cxxsemaphore"]
11-
path = libs/cxxsemaphore
12-
url = https://github.com/NikolasK-source/cxxsemaphore.git

0 commit comments

Comments
 (0)