Skip to content

update to 1.4.0 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AllowAllConstructorInitializersOnNextLine: 'true'
AllowAllParametersOfDeclarationOnNextLine: 'true'
AllowShortBlocksOnASingleLine: 'true'
AllowShortCaseLabelsOnASingleLine: 'true'
AllowShortFunctionsOnASingleLine: All
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortIfStatementsOnASingleLine: Always
AllowShortLambdasOnASingleLine: All
AlwaysBreakAfterReturnType: None
Expand Down Expand Up @@ -48,4 +48,4 @@ SpacesInAngles: 'false'
SpacesInCStyleCastParentheses: 'false'
Standard: Cpp11
TabWidth: '4'
UseTab: Never
UseTab: Never
61 changes: 61 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
Checks: 'bugprone-*,
cert-dcl21-cpp,
cert-dcl58-cpp,
cert-err34-c,
cert-err52-cpp,
cert-err60-cpp,
cert-flp30-c,
cert-msc50-cpp,
cert-msc51-cpp,
cert-str34-c,
cppcoreguidelines-*,
clang-analyzer-*,
google-default-arguments,
google-explicit-constructor,
google-runtime-operator,
hicpp-exception-baseclass,
hicpp-multiway-paths-covered,
misc-misplaced-const,
misc-new-delete-overloads,
misc-no-recursion,
misc-non-copyable-objects,
misc-throw-by-value-catch-by-reference,
misc-unconventional-assign-operator,
misc-uniqueptr-reset-release,
modernize-*,
mpi-buffer-deref,
mpi-type-mismatch,
openmp-use-default-none,
portability-*,
performance-*,
readability-avoid-const-params-in-decls,
readability-const-return-type,
readability-container-size-empty,
readability-convert-member-functions-to-static,
readability-delete-null-pointer,
readability-deleted-default,
readability-inconsistent-declaration-parameter-name,
readability-make-member-function-const,
readability-misleading-indentation,
readability-misplaced-array-index,
readability-non-const-parameter,
readability-redundant-control-flow,
readability-redundant-declaration,
readability-redundant-function-ptr-dereference,
readability-redundant-smartptr-get,
readability-redundant-string-cstr,
readability-redundant-string-init,
readability-simplify-subscript-expr,
readability-static-accessed-through-instance,
readability-static-definition-in-anonymous-namespace,
readability-string-compare,
readability-uniqueptr-delete-release,
readability-use-anyofallof
-modernize-use-trailing-return-type
-bugprone-exception-escape'
WarningsAsErrors: '*,
-modernize-*,
-readability-*
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-pro-type-vararg'
HeaderFilterRegex: ''
57 changes: 57 additions & 0 deletions .clang-tidy-noerrors
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
Checks: 'bugprone-*,
cert-dcl21-cpp,
cert-dcl58-cpp,
cert-err34-c,
cert-err52-cpp,
cert-err60-cpp,
cert-flp30-c,
cert-msc50-cpp,
cert-msc51-cpp,
cert-str34-c,
cppcoreguidelines-*,
clang-analyzer-*,
google-default-arguments,
google-explicit-constructor,
google-runtime-operator,
hicpp-exception-baseclass,
hicpp-multiway-paths-covered,
misc-misplaced-const,
misc-new-delete-overloads,
misc-no-recursion,
misc-non-copyable-objects,
misc-throw-by-value-catch-by-reference,
misc-unconventional-assign-operator,
misc-uniqueptr-reset-release,
modernize-*,
mpi-buffer-deref,
mpi-type-mismatch,
openmp-use-default-none,
portability-*,
performance-*,
readability-avoid-const-params-in-decls,
readability-const-return-type,
readability-container-size-empty,
readability-convert-member-functions-to-static,
readability-delete-null-pointer,
readability-deleted-default,
readability-inconsistent-declaration-parameter-name,
readability-make-member-function-const,
readability-misleading-indentation,
readability-misplaced-array-index,
readability-non-const-parameter,
readability-redundant-control-flow,
readability-redundant-declaration,
readability-redundant-function-ptr-dereference,
readability-redundant-smartptr-get,
readability-redundant-string-cstr,
readability-redundant-string-init,
readability-simplify-subscript-expr,
readability-static-accessed-through-instance,
readability-static-definition-in-anonymous-namespace,
readability-string-compare,
readability-uniqueptr-delete-release,
readability-use-anyofallof
-modernize-use-trailing-return-type
-bugprone-exception-escape'
WarningsAsErrors: ''
HeaderFilterRegex: ''
19 changes: 12 additions & 7 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
strategy:
matrix:
path:
- 'src'
- 'test'
steps:
- uses: actions/checkout@v2
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.8.0
with:
clang-format-version: '14'
check-path: 'src'

- uses: actions/checkout@v2
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.8.0
with:
clang-format-version: '14'
check-path: ${{ matrix.path }}

43 changes: 40 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: CMake

on:
[push, pull_request ]
on: [push, pull_request]

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

- name: create tmp dir
run: mkdir tmp

- name: update
run: |
sudo apt update
sudo apt upgrade -y

- name: install cxxopts
run: |
git clone https://github.com/jarro2783/cxxopts.git tmp/cxxopts
cd tmp/cxxopts
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
cmake --build build
sudo cmake --install build
cd -

- name: install cxxshm
run: |
git clone https://github.com/NikolasK-source/cxxshm.git tmp/cxxshm
cd tmp/cxxshm
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
cmake --build build
sudo cmake --install build
cd -

- name: install cxxsemaphore
run: |
git clone https://github.com/NikolasK-source/cxxsemaphore.git tmp/cxxsemaphore
cd tmp/cxxsemaphore
git checkout $(git tag | grep -P '^v\d+\.\d+\.\d+$' | sort | tail -1)
cmake -B build . -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF
cmake --build build
sudo cmake --install build
cd -

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLANG_FORMAT=OFF -DCOMPILER_WARNINGS=OFF -DCLANG_TIDY=OFF -DBUILD_DOC=OFF

- name: Build
# Build your program with the given configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
on:
push:
branches: [ "main", "development" ]
pull_request:
[ push, pull_request ]
name: Flatpak_test
jobs:
flatpak:
name: "Flatpak"
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:freedesktop-21.08
image: bilelmoussaoui/flatpak-github-actions:freedesktop-23.08
options: --privileged
steps:
- uses: actions/checkout@v2
Expand All @@ -22,9 +20,9 @@ jobs:
- name: Update submodules
run: git submodule update

- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
name: "Build"
with:
bundle: test_stdin-to-modbus-shm.flatpak
manifest-path: network.koesling.test-stdin-to-modbus-shm.yml
cache-key: flatpak-builder-${{ github.sha }}
cache-key: flatpak-builder-${{ github.sha }}
20 changes: 0 additions & 20 deletions .github/workflows/flatpak_release.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# general
build*
docs/*
docs_doxy

!docs/index.md
!docs/_config.yml
Expand Down
9 changes: 0 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
[submodule "libs/cxxopts"]
path = libs/cxxopts
url = https://github.com/NikolasK-source/cxxopts.git
[submodule "libs/cxxshm"]
path = libs/cxxshm
url = https://github.com/NikolasK-source/cxxshm.git
[submodule "libs/cxxendian"]
path = libs/cxxendian
url = https://github.com/NikolasK-source/cxxendian.git
[submodule "libs/cxxsemaphore"]
path = libs/cxxsemaphore
url = https://github.com/NikolasK-source/cxxsemaphore.git
Loading
Loading