Fix build

.github/workflows/build-test.yaml

@@ -42,11 +42,15 @@ jobs:
           fetch-depth: 0
 
       - name: Install build wrapper
-        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v4
+        uses: SonarSource/sonarqube-scan-action/install-build-wrapper@v5
 
-      - name: Build
+      - name: Build (Release)
         run: |
-          ./build.sh build --ci
+          ./build.sh build --build-type Release
+
+      - name: Build (Debug)
+        run: |
+          ./build.sh build --ci --clean
 
       - name: Test
         run: |
@@ -62,9 +66,9 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./build/coverage.total
 
-      - name: SonarQube analysis
+      - name: SonarQube analysis (on push)
         if: github.event_name == 'push'
-        uses: SonarSource/sonarqube-scan-action@v4
+        uses: SonarSource/sonarqube-scan-action@v5
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
@@ -73,9 +77,9 @@ jobs:
             --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"
             --define sonar.coverageReportPaths=build/coverage_sonarqube.xml
 
-      - name: SonarQube analysis
+      - name: SonarQube analysis (on pull request)
         if: github.event_name == 'pull_request_target'
-        uses: SonarSource/sonarqube-scan-action@v4
+        uses: SonarSource/sonarqube-scan-action@v5
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-format.yaml

@@ -20,7 +20,7 @@ jobs:
         uses: jidicula/[email protected]
         with:
           clang-format-version: "15"
-          exclude-regex: src\/common\/crypto\/mbedtls\/drivers\/.*|mbedtls_config\.h|include\/aos\/common\/pkcs11\/cryptoki/.*|seqoid\.hpp
+          exclude-regex: src\/core\/common\/crypto\/mbedtls\/drivers\/.*|mbedtls_config\.h|src\/core\/common\/pkcs11\/cryptoki/.*|seqoid\.hpp
 
       - name: Run cmake-format style check
         run: |

.github/workflows/docker-build.yml

@@ -0,0 +1,45 @@
+name: Build and push docker image
+
+on:
+  push:
+    paths:
+      - "docker/**"
+      - ".github/workflows/docker-build.yml"
+
+    branches:
+      - main
+      - develop
+      - feature*
+
+defaults:
+  run:
+    working-directory: ./docker
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Log in to github container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: ghcr.io/${{ github.repository_owner }}/aos-core-build:latest

CMakeLists.txt

@@ -5,10 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-cmake_minimum_required(VERSION 3.19)
-
-# Check compiler using static library instead of applicion
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+cmake_minimum_required(VERSION 3.23)
 
 project("aos_core_lib_cpp")
 
@@ -34,8 +31,9 @@ message(STATUS)
 # Config
 # ######################################################################################################################
 
-set(AOS_CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(AOS_STACK_USAGE 4096)
+# Check compiler using static library instead of application
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(AOS_STACK_USAGE 8192)
 
 # ######################################################################################################################
 # Compiler flags
@@ -47,15 +45,12 @@ set(CMAKE_CXX_FLAGS "${common_flags} ${CMAKE_CXX_FLAGS}")
 set(CMAKE_C_FLAGS "${common_flags} ${CMAKE_C_FLAGS}")
 set(CMAKE_CXX_STANDARD 17)
 
-if(WITH_TEST)
-    add_definitions(-include ${AOS_CORE_LIB_DIR}/include/aos/test/aoscoretestconfig.hpp)
-endif()
-
 # ######################################################################################################################
 # Dependencies
 # ######################################################################################################################
 
-set(CMAKE_MODULE_PATH ${AOS_CORE_LIB_DIR}/cmake)
+set(VERSION_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 if(WITH_TEST)
     find_package(GTest REQUIRED)
@@ -70,7 +65,7 @@ if(WITH_COVERAGE)
 
     append_coverage_compiler_flags()
 
-    set(COVERAGE_EXCLUDES "build/*" "tests/*" "/usr/*")
+    set(COVERAGE_EXCLUDES "build/*" "src/core/*/*/tests/*" "/usr/*")
     set(GCOVR_ADDITIONAL_ARGS --gcov-ignore-parse-errors=negative_hits.warn_once_per_file)
 
     setup_target_for_coverage_lcov(
@@ -85,28 +80,6 @@ if(WITH_COVERAGE)
     )
 endif()
 
-# ######################################################################################################################
-# Includes
-# ######################################################################################################################
-
-include_directories(include)
-
-# ######################################################################################################################
-# Targets
-# ######################################################################################################################
-
-add_subdirectory(src/common)
-add_subdirectory(src/sm)
-add_subdirectory(src/iam)
-
-if(WITH_TEST)
-    add_subdirectory(tests)
-endif()
-
-# ######################################################################################################################
-# Doc
-# ######################################################################################################################
-
 if(WITH_DOC)
     find_package(Doxygen)
 
@@ -120,3 +93,9 @@ if(WITH_DOC)
         VERBATIM
     )
 endif()
+
+# ######################################################################################################################
+# Subdirectories
+# ######################################################################################################################
+
+add_subdirectory(src)

README.md

@@ -123,11 +123,27 @@ cd build/
 make  install
 ```
 
+## Use docker container
+
+Build container:
+
+```console
+docker build -t aos-core-build:latest -f docker/Dockerfile .
+```
+
+Run container:
+
+```console
+docker run -v ${PWD}:/opt/aos_core_cpp -w /opt/aos_core_cpp -it --rm aos-core-build:latest
+```
+
+All above commands for build, test, coverage etc. can be used inside the docker container.
+
 ## Development tools
 
 The following tools are used for code formatting and analyzing:
 
-| Tool | Description | Configuration | Link
+| Tool | Description | Configuration | Link |
 | --- | --- | --- | --- |
 | `clang-format` | used for source code formatting | .clang-format | <https://clang.llvm.org/docs/ClangFormat.html> |
 | `cmake-format` | used for formatting cmake files | .cmake-format | <https://github.com/cheshirekow/cmake_format> |

build.sh

@@ -23,9 +23,10 @@ print_usage() {
     echo "  doc                        generates documentation"
     echo
     echo "Options:"
-    echo "  --clean                    cleans build artifacts"
-    echo "  --aos-service <services>   specifies services (e.g., sm,mp,iam)"
+    echo "  --clean                    cleans build artifacts before building"
     echo "  --ci                       uses build-wrapper for CI analysis (SonarQube)"
+    echo "  --parallel <N>             specifies number of parallel jobs for build (default: all available cores)"
+    echo "  --build-type <type>        specifies build type (default: Debug, other options: Release, RelWithDebInfo, MinSizeRel)"
     echo
 }
 
@@ -57,15 +58,15 @@ conan_setup() {
 
     print_next_step "Generate conan toolchain"
 
-    conan install ./conan/ --output-folder build --settings=build_type=Debug --build=missing
+    conan install ./conan/ --output-folder build --settings=build_type="$ARG_BUILD_TYPE" --build=missing
 }
 
 build_project() {
     print_next_step "Run cmake configure"
 
     cmake -S . -B build \
         -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake \
-        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_BUILD_TYPE="$ARG_BUILD_TYPE" \
         -G "Unix Makefiles" \
         -DCoverage_SONARQUBE=ON \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
@@ -77,11 +78,11 @@ build_project() {
     if [ "$ARG_CI_FLAG" == "true" ]; then
         print_next_step "Run build-wrapper and build (CI mode)"
 
-        build-wrapper-linux-x86-64 --out-dir "$BUILD_WRAPPER_OUT_DIR" cmake --build ./build/ --config Debug --parallel
+        build-wrapper-linux-x86-64 --out-dir "$BUILD_WRAPPER_OUT_DIR" cmake --build ./build/ --config "$ARG_BUILD_TYPE" --parallel "$ARG_PARALLEL_JOBS"
     else
         print_next_step "Run build"
 
-        cmake --build ./build/ --config Debug --parallel
+        cmake --build ./build/ --config "$ARG_BUILD_TYPE" --parallel "$ARG_PARALLEL_JOBS"
     fi
 
     echo
@@ -101,6 +102,16 @@ parse_arguments() {
             shift
             ;;
 
+        --parallel)
+            ARG_PARALLEL_JOBS="$2"
+            shift 2
+            ;;
+
+        --build-type)
+            ARG_BUILD_TYPE="$2"
+            shift 2
+            ;;
+
         *)
             error_with_usage "Unknown option: $1"
             ;;
@@ -111,8 +122,6 @@ parse_arguments() {
 build_target() {
     if [ "$ARG_CLEAN_FLAG" == "true" ]; then
         clean_build
-
-        return
     fi
 
     conan_setup
@@ -141,8 +150,7 @@ run_lint() {
     print_next_step "Run static analysis (cppcheck)"
 
     cppcheck --enable=all --inline-suppr --std=c++17 --error-exitcode=1 \
-        --suppressions-list=./suppressions.txt --project=build/compile_commands.json --file-filter='src/*' \
-        --file-filter='tests/*' --file-filter='include/*'
+        --suppressions-list=./suppressions.txt --project=build/compile_commands.json --file-filter='src/*'
 
     echo
     echo "Static analysis completed!"
@@ -170,8 +178,9 @@ command="$1"
 shift
 
 ARG_CLEAN_FLAG=false
-ARG_AOS_SERVICES=""
 ARG_CI_FLAG=false
+ARG_PARALLEL_JOBS=$(nproc)
+ARG_BUILD_TYPE="Debug"
 
 case "$command" in
 build)