Skip to content
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
8 changes: 4 additions & 4 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ build --@score_baselibs_rust//src/log:safety_level=qm
build --@score_baselibs//score/json:base_library=nlohmann
build --@score_logging//score/mw/log/flags:KRemote_Logging=False

# Clippy linting (enabled by default)
build --aspects=@score_rust_policies//clippy:linters.bzl%clippy_strict
build --output_groups=+rules_lint_human
build:lint --@aspect_rules_lint//lint:fail_on_violation=true
# Clippy linting is temporarily disabled in the default configuration because
# the upstream lint toolchain currently resolves an APE-hosted binary URL that
# returns 403 during module fetches, which breaks unrelated commands such as
# `bazel run //:docs`.
build:lint --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
build:lint --config=per-x86_64-linux

Expand Down
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ docs(
"@score_platform//:needs_json",
"@score_process//:needs_json",
],
source_dir = "docs",
source_dir = ".",
)

setup_starpls(
Expand Down
23 changes: 13 additions & 10 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module(

## Toolchains (dependencies and config)
# python
bazel_dep(name = "rules_python", version = "1.4.1")
bazel_dep(name = "rules_python", version = "1.8.3")

PYTHON_VERSION = "3.12"

Expand All @@ -39,21 +39,18 @@ use_repo(pip, "pip_score_venv_test")
# rust
bazel_dep(name = "rules_rust", version = "0.68.2-score")

# Shared Rust policies (Clippy config, etc.), overridden locally during development.
bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True)

# bazel cc rules
bazel_dep(name = "rules_cc", version = "0.1.2")
bazel_dep(name = "rules_cc", version = "0.2.17")

# Toolchains and extensions
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
bazel_dep(name = "score_toolchains_rust", version = "0.9.1", dev_dependency = True)

## Bazel registry
# Module dependencies
bazel_dep(name = "googletest", version = "1.17.0.bcr.1")
bazel_dep(name = "googletest", version = "1.17.0.bcr.2")

bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True)
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)

bazel_dep(name = "platforms", version = "1.0.0")

Expand All @@ -70,6 +67,13 @@ bazel_dep(name = "score_python_basics", version = "0.3.4")
bazel_dep(name = "score_tooling", version = "1.2.0")
bazel_dep(name = "score_logging", version = "0.2.0")

# grpc-java 1.69.0 is the first BCR release in this dependency line that
# explicitly supports Bazel 8 and avoids the broken legacy grpc extension import.
single_version_override(
module_name = "grpc-java",
version = "1.69.0",
)

# TODO: remove once inherited properly from `score_logging`.
bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
git_override(
Expand All @@ -78,9 +82,8 @@ git_override(
remote = "https://github.com/bmw-software-engineering/trlc.git",
)

# ToDo: implicit dependencies for score_tooling, but needed directly here??
bazel_dep(name = "aspect_rules_lint", version = "2.0.0")
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
bazel_dep(name = "aspect_rules_lint", version = "2.0.0")

## temporary overrides / tools
# Testing utils dependency.
Expand Down Expand Up @@ -149,4 +152,4 @@ use_repo(
)

# S-CORE crates
bazel_dep(name = "score_crates", version = "0.0.7")
bazel_dep(name = "score_crates", version = "0.0.9")
281 changes: 95 additions & 186 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,7 @@ bazel test <TARGET_NAME>

## Clippy

- Clippy runs by default via `.bazelrc` when building Rust targets (rules_lint aspect).
- Use `bazel build //src/rust/...` (or any Rust target pattern) while developing.
- Use `bazel build --config=lint //src/rust/...` to enable lint config, including `--@aspect_rules_lint//lint:fail_on_violation=true`.
- The Clippy config comes from `@score_rust_policies//clippy/strict:clippy.toml`.
- Clippy is currently disabled in `.bazelrc` because the upstream lint toolchain resolves an APE-hosted binary URL that returns HTTP 403 and breaks unrelated Bazel commands.

## Cargo-based operations

Expand Down
6 changes: 6 additions & 0 deletions docs/conf.py → conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@

myst_enable_extensions = ["colon_fence"]

include_patterns = [
"index.rst",
"docs/**",
"score/**",
]

exclude_patterns = [
# The following entries are not required when building the documentation via 'bazel
# build //:docs', as that command runs in a sandboxed environment. However, when
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

Module Documents
################
.. _features_persistency:

Features
========

.. toctree::
:maxdepth: 1
:glob:

manual/index.rst
safety_mgt/index.rst
security_mgt/index.rst
verification/module_verification_report.rst
release/release_note.rst

38 changes: 0 additions & 38 deletions docs/index.rst

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Safety Manual
=============

.. document:: Persistency Safety Manual
:id: doc__persistency_safety_manual_v2
:id: doc__persistency_safety_manual
:status: valid
:safety: ASIL_B
:security: NO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Security Manual
===============

.. document:: Persistency Security Manual
:id: doc__persistency_security_manual_v2
:id: doc__persistency_security_manual
:status: draft
:safety: ASIL_B
:security: YES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Release Note
============

.. document:: Persistency Release Note
:id: doc__persistency_release_note_v2
:id: doc__persistency_release_note
:status: valid
:safety: ASIL_B
:security: NO
Expand Down Expand Up @@ -83,7 +83,7 @@ Performed Verification
^^^^^^^^^^^^^^^^^^^^^^

This release note is based on the verification as documented in module verification report
:need:`doc__persistency_verification_report_v2`.
:need:`doc__persistency_verification_report`.

Known Issues
------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Safety Analysis Checklist
=========================

.. document:: Persistency Safety Analysis Checklist
:id: doc__persistency_safety_analysis_fdr_v2
:id: doc__module_safety_analysis_fdr
:status: draft
:safety: ASIL_B
:security: YES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Safety Package Formal Review Report
===================================

.. document:: Persistency Safety Package Formal Review
:id: doc__persistency_safety_package_fdr_v2
:id: doc__persistency_safety_package_fdr
:status: valid
:safety: ASIL_B
:security: NO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Module Safety Plan
******************

.. document:: Persistency Safety Plan
:id: doc__persistency_safety_plan_v2
:id: doc__persistency_safety_plan
:status: valid
:safety: ASIL_B
:security: NO
Expand Down Expand Up @@ -86,12 +86,12 @@ Module Workproducts List
* - :need:`wp__fdr_reports` (module Safety Plan)
- :need:`gd_chklst__safety_plan`
- :ndf:`copy('status', need_id='gd_chklst__safety_plan')`
- :need:`doc__persistency_safety_plan_v2_fdr_v2`
- :need:`doc__persistency_safety_plan_fdr`

* - :need:`wp__fdr_reports` (module Safety Package)
- :need:`gd_chklst__safety_package`
- :ndf:`copy('status', need_id='gd_chklst__safety_package')`
- :need:`doc__persistency_safety_package_fdr_v2`
- :need:`doc__persistency_safety_package_fdr`

* - :need:`wp__fdr_reports` (module's Safety Analyses & DFA)
- :need:`gd_guidl__safety_analysis`
Expand All @@ -106,17 +106,17 @@ Module Workproducts List
* - :need:`wp__module_safety_manual`
- :need:`gd_temp__safety_manual`
- :ndf:`copy('status', need_id='gd_temp__safety_manual')`
- :need:`doc__persistency_safety_manual_v2`
- :need:`doc__persistency_safety_manual`

* - :need:`wp__verification_module_ver_report`
- :need:`gd_temp__mod_ver_report`
- :ndf:`copy('status', need_id='gd_temp__mod_ver_report')`
- :need:`doc__persistency_verification_report_v2`
- :need:`doc__persistency_verification_report`

* - :need:`wp__module_sw_release_note`
- :need:`gd_temp__rel_mod_rel_note`
- :ndf:`copy('status', need_id='gd_temp__rel_mod_rel_note')`
- :need:`doc__persistency_release_note_v2`
- :need:`doc__persistency_release_note`


Component KVS Workproducts List
Expand All @@ -133,12 +133,12 @@ Component KVS Workproducts List
* - :need:`wp__requirements_comp`
- :need:`gd_temp__req_comp_req`
- :ndf:`copy('status', need_id='gd_temp__req_comp_req')`
- :need:`doc__persistency_kvs_requirements_v2`
- :need:`doc__kvs_requirements`

* - :need:`wp__requirements_comp_aou`
- :need:`gd_temp__req_aou_req`
- :ndf:`copy('status', need_id='gd_temp__req_aou_req')`
- :need:`doc__persistency_kvs_requirements_v2`
- :need:`doc__kvs_requirements`

* - :need:`wp__requirements_inspect`
- :need:`gd_chklst__req_inspection`
Expand All @@ -148,7 +148,7 @@ Component KVS Workproducts List
* - :need:`wp__component_arch`
- :need:`gd_temp__arch_comp`
- :ndf:`copy('status', need_id='gd_temp__arch_comp')`
- :need:`doc__persistency_kvs_architecture_v2`
- :need:`doc__kvs_architecture`

* - :need:`wp__sw_arch_verification`
- :need:`gd_chklst__arch_inspection_checklist`
Expand All @@ -158,12 +158,12 @@ Component KVS Workproducts List
* - :need:`wp__sw_component_fmea`
- :need:`wp__sw_component_fmea`
- :ndf:`copy('status', need_id='gd_guidl__safety_analysis')`
- :need:`doc__persistency_kvs_fmea_v2`
- :need:`doc__kvs_fmea`

* - :need:`wp__sw_component_dfa`
- :need:`wp__sw_component_dfa`
- :ndf:`copy('status', need_id='gd_guidl__safety_analysis')`
- :need:`doc__persistency_kvs_dfa_v2`
- :need:`doc__kvs_dfa`

* - :need:`wp__sw_implementation`
- :need:`gd_guidl__implementation`
Expand All @@ -188,7 +188,7 @@ Component KVS Workproducts List
* - :need:`wp__sw_component_class`
- :need:`gd_guidl__component_classification`
- :ndf:`copy('status', need_id='gd_guidl__component_classification')`
- :need:`doc__persistency_component_classification_v2`
- :need:`doc__json_comp_class`


OSS (sub-)component qualification plan
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Safety Plan Formal Review Report
================================

.. document:: Persistency Safety Plan Formal Review
:id: doc__persistency_safety_plan_v2_fdr_v2
:id: doc__persistency_safety_plan_fdr
:status: valid
:safety: ASIL_B
:security: NO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Security Package Formal Review Report
=====================================

.. document:: Persistency Security Package Formal Review
:id: doc__persistency_security_package_fdr
:id: doc__persistency_sec_pkg_fdr
:status: valid
:safety: ASIL_B
:security: YES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ Security Module Workproducts
- :need:`gd_chklst__security_package`
- :ndf:`copy('status', need_id='gd_chklst__security_package')`
- <Link to issue>
- :need:`doc__persistency_security_package_fdr`
- :ndf:`copy('status', need_id='doc__persistency_security_package_fdr')`
- :need:`doc__persistency_sec_pkg_fdr`
- :ndf:`copy('status', need_id='doc__persistency_sec_pkg_fdr')`

* - :need:`wp__fdr_reports` (module's Security Analyses)
- :need:`gd_guidl__security_analysis`
Expand Down Expand Up @@ -155,14 +155,14 @@ Security Module Workproducts
- :need:`gd_temp__req_comp_req`
- :ndf:`copy('status', need_id='gd_temp__req_comp_req')`
- <Link to issue>
- :need:`doc__persistency_kvs_requirements_v2`
- :need:`doc__kvs_requirements`
- <automated>

* - :need:`wp__requirements_comp_aou`
- :need:`gd_temp__req_aou_req`
- :ndf:`copy('status', need_id='gd_temp__req_aou_req')`
- <Link to issue>
- :need:`doc__persistency_kvs_requirements_v2`
- :need:`doc__kvs_requirements`
- <automated>

* - :need:`wp__requirements_inspect`
Expand All @@ -176,7 +176,7 @@ Security Module Workproducts
- :need:`gd_temp__arch_comp`
- :ndf:`copy('status', need_id='gd_temp__arch_comp')`
- <Link to issue>
- :need:`doc__persistency_kvs_architecture_v2`
- :need:`doc__kvs_architecture`
- <automated>

* - :need:`wp__sw_component_security_analysis`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Verification Report
===================

.. document:: Persistency Verification Report
:id: doc__persistency_verification_report_v2
:id: doc__persistency_verification_report
:status: valid
:safety: ASIL_B
:security: NO
Expand Down
Loading
Loading