Merge pull request #38 from qorix-group/MSP_update_main

Manual Update of Fork to Main

Author: PandaeDo

.bazelrc

@@ -28,9 +28,7 @@ build --tool_java_runtime_version=remotejdk_17
 build --@score_baselibs//score/json:base_library=nlohmann
 build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
 
-# ToDo: needed for "wrong" implicit dependencies
-build --@score-baselibs//score/json:base_library=nlohmann
-build --@score-baselibs//score/mw/log/flags:KRemote_Logging=False
+common --extra_toolchains=@gcc_toolchain//:host_gcc_12
 
 # Clippy linting (enabled by default)
 build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect

.clang-format

@@ -0,0 +1,48 @@
+BasedOnStyle: Google
+AccessModifierOffset: -2
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+# Empty is required in AllowShortFunctionsOnASingleLine over Inline because Inline contradicts with AUTOSAR rule A7-1-7
+# Such rule is no longer existing in MISRA C++:2023, once we are fully migrated to MISRA C++:2023, switching to Inline
+# could be reconsidered
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
+BreakBeforeBraces: Custom
+ColumnLimit: 120
+DerivePointerAlignment: false
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^(<|")(assert|complex|ctype|errno|fenv|float|inttypes|iso646|limits|locale|math|setjmp|signal|stdalign|stdargh|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|tgmath|threads|time|uchar|wchar|wctype)\.h(>|")$'
+    Priority: 2
+  - Regex: '^(<|")(cstdlib|csignal|csetjmp|cstdarg|typeinfo|typeindex|type_traits|bitset|functional|utility|ctime|chrono|cstddef|initializer_list|tuple|any|optional|variant|new|memory|scoped_allocator|memory_resource|climits|cfloat|cstdint|cinttypes|limits|exception|stdexcept|cassert|system_error|cerrno|cctype|cwctype|cstring|cwchar|cuchar|string|string_view|array|vector|deque|list|forward_list|set|map|unordered_set|unordered_map|stack|queue|algorithm|execution|teratorslibrary|iterator|cmath|complex|valarray|random|numeric|ratio|cfenv|iosfwd|ios|istream|ostream|iostream|fstream|sstream|strstream|iomanip|streambuf|cstdio|locale|clocale|codecvt|regex|atomic|thread|mutex|shared_mutex|future|condition_variable|filesystem|ciso646|ccomplex|ctgmath|cstdalign|cstdbool)(>|")$'
+    Priority: 3
+  - Regex: '^(<|").*(>|")$'
+    Priority: 1
+IndentWidth: 4
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+QualifierAlignment: Left
+CommentPragmas: '^.*A2Lfactory:'
+---
+# Make sure language specific settings are below the generic settings to be compatible to all languages.
+Language: Cpp
+Standard: c++17

.devcontainer/devcontainer.json

@@ -1,17 +1,4 @@
 {
     "name": "eclipse-s-core",
-    "image": "ghcr.io/eclipse-score/devcontainer:1.0.0",
-    "features": {
-        "ghcr.io/devcontainers/features/rust:1.5.0": {
-            "version": "1.83.0",
-            "components": [
-                "cargo",
-                "clippy",
-                // "miri", // only available at nightly
-                // "rust-analyzer", // already provided by the image
-                "rust-src",
-                "rustfmt"
-            ]
-        }
-    }
+    "image": "ghcr.io/eclipse-score/devcontainer:v1.1.0"
 }

.github/workflows/check.yml

@@ -33,7 +33,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.83.0
+          toolchain: 1.90.0
           components: clippy, rustfmt
 
       - name: Cargo Clippy
@@ -57,7 +57,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2024-12-17
+          toolchain: nightly-2025-12-15
           components: miri, rust-src
 
       - name: Install Clang
@@ -67,7 +67,7 @@ jobs:
 
       - name: Cargo Miri
         run: |
-          cargo +nightly-2024-12-17 miri test
+          cargo +nightly-2025-12-15 miri test
 
   cargo-coverage:
     runs-on: ubuntu-latest
@@ -76,16 +76,16 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2024-12-17
+          toolchain: nightly-2025-12-15
           components: llvm-tools-preview, rust-src
 
       - name: Install cargo-llvm-cov
         run: |
-          cargo +nightly-2024-12-17 install cargo-llvm-cov --locked
+          cargo +nightly-2025-12-15 install cargo-llvm-cov --locked
 
       - name: Cargo llvm-cov
         run: |
-          cargo +nightly-2024-12-17 llvm-cov --branch --tests --lib
+          cargo +nightly-2025-12-15 llvm-cov --branch --tests --lib
 
   rust-bazel:
     runs-on: ubuntu-latest

.github/workflows/component_integration_tests.yml

@@ -20,6 +20,7 @@ on:
       - main
   merge_group:
     types: [checks_requested]
+  workflow_call:
 
 jobs:
   component-integration-tests:
@@ -28,13 +29,21 @@ jobs:
       run:
         shell: bash
     steps:
+      - name: Checkout repository (pull_request_target via workflow_call)
+        if: ${{ github.event_name == 'pull_request_target' }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref || github.event.pull_request.head.ref || github.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+
       - name: Checkout repository
+        if: ${{ github.event_name != 'pull_request_target' }}
         uses: actions/checkout@v4
 
       - name: Setup Rust build environment
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.83.0
+          toolchain: 1.90.0
 
       - name: Setup Bazel
         uses: bazel-contrib/setup-bazel@0.15.0
@@ -46,26 +55,44 @@ jobs:
 
       - name: Build C++ test scenarios with Bazel
         run: |
-          bazel build --config=per-x86_64-linux //tests/cpp_test_scenarios:cpp_test_scenarios
+          bazel build --config=per-x86_64-linux //tests/test_scenarios/cpp:test_scenarios
 
       - name: Build Rust test scenarios with Bazel
         run: |
-          bazel build //tests/rust_test_scenarios:rust_test_scenarios
+          bazel build //tests/test_scenarios/rust:test_scenarios
 
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 
       - name: Set up Python virtual environment
-        working-directory: tests/python_test_cases
         run: |
           python -m venv .venv
           source .venv/bin/activate
-          pip install .
+          pip install -r tests/test_cases/requirements.txt
 
       - name: Run Python tests with pytest
-        working-directory: tests/python_test_cases
         run: |
           source .venv/bin/activate
-          python -m pytest
+          python -m pytest --traces=all
+
+      - name: Run Python tests with bazel
+        run: |
+          bazel test //tests/test_cases:cit
+
+      - name: Prepare test reports
+        if: always()
+        # Creating tests-report directory
+        # Follow Symlinks via '-L' to copy correctly
+        # Copy everything inside the 'test-reports' folder
+        run: |
+          mkdir -p tests-report
+          rsync -amL --include='*/' --include='test.xml' --include='test.log' --exclude='*' bazel-testlogs/ tests-report/
+
+      - name: Upload bundled test report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-report
+          path: tests-report

.github/workflows/docs.yml

@@ -29,7 +29,21 @@ on:
     types: [checks_requested]
 
 jobs:
+  docs-verify:
+    uses: eclipse-score/cicd-workflows/.github/workflows/docs-verify.yml@main
+    permissions:
+      pull-requests: write
+      contents: read
+    with:
+      bazel-docs-verify-target: "//:docs_check"
+
+  cit-tests:
+    uses: ./.github/workflows/component_integration_tests.yml
+    secrets: inherit
+
   build-docs:
+    needs: [docs-verify, cit-tests] # Test reports are needed for traceability links
+    if: ${{ always() && needs.docs-verify.result == 'success' }}
     uses: eclipse-score/cicd-workflows/.github/workflows/docs.yml@main
     permissions:
       contents: write
@@ -40,3 +54,4 @@ jobs:
     with:
       bazel-target: "//:docs -- --github_user=${{ github.repository_owner }} --github_repo=${{ github.event.repository.name }}"
       retention-days: 3
+      tests-report-artifact: tests-report

.github/workflows/release.yml

@@ -17,7 +17,7 @@ on:
     types: [created]
 
 jobs:
-  archive-report:
+  release-verification:
     runs-on: ubuntu-latest
     permissions:
       contents: write # required to upload release assets
@@ -60,13 +60,30 @@ jobs:
 
       - name: Build via Bazel
         run: |
-          echo "Running: bazel build //src/..."
-          bazel build //src/...
+          echo "Running: bazel build --config=per-x86_64-linux //src/..."
+          bazel build --config=per-x86_64-linux //src/...
 
       - name: Run Unit Tests via Bazel
         run: |
-          echo "Running: bazel test //:unit_tests"
-          bazel test //:unit_tests
+          echo "Running: bazel test --config=per-x86_64-linux //:unit_tests"
+          bazel test --config=per-x86_64-linux //:unit_tests
+
+      - name: Run Unit Test with Coverage for Rust
+        run: |
+          # Run tests
+          bazel coverage --config=per-x86_64-linux //:unit_tests \
+            --collect_code_coverage \
+            --combined_report=lcov \
+            --experimental_generate_llvm_lcov \
+            --nocache_test_results \
+            --nostamp
+          # Generate HTML report
+          genhtml "$(bazel info output_path)/_coverage/_coverage_report.dat" \
+            -o=rust_coverage \
+            --show-details \
+            --legend \
+            --function-coverage \
+            --branch-coverage
 
       - name: Run Unit Test with Coverage for C++
         run: |
@@ -87,24 +104,8 @@ jobs:
             --show-details \
             --legend \
             --function-coverage \
-            --branch-coverage
-
-      - name: Run Unit Test with Coverage for Rust
-        run: |
-          # Run tests
-          bazel coverage //:unit_tests_rust \
-            --collect_code_coverage \
-            --combined_report=lcov \
-            --experimental_generate_llvm_lcov \
-            --nocache_test_results \
-            --nostamp
-          # Generate HTML report
-          genhtml "$(bazel info output_path)/_coverage/_coverage_report.dat" \
-            -o=rust_coverage \
-            --show-details \
-            --legend \
-            --function-coverage \
-            --branch-coverage
+            --branch-coverage \
+            --ignore-errors=unmapped
 
       - name: Create archive of test report
         run: |

BUILD

@@ -129,8 +129,8 @@ test_suite(
 test_suite(
     name = "cit_tests",
     tests = [
-        "//tests/python_test_cases:cit_cpp",
-        "//tests/python_test_cases:cit_rust",
+        "//tests/test_cases:cit_cpp",
+        "//tests/test_cases:cit_rust",
     ],
     visibility = ["//visibility:public"],
 )

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = [
     "src/rust/rust_kvs",
     "src/rust/rust_kvs_tool",
-    "tests/rust_test_scenarios",
+    "tests/test_scenarios/rust",
 ]