Skip to content

Commit 401b83c

Browse files
4ogantonkripawelrutkaq
authored
v0.8 alignment (#272)
Bump Score deps to newest state As preparation to v0.8 release --------- Co-authored-by: Anton Krivoborodov <63401640+antonkri@users.noreply.github.com> Co-authored-by: Pawel Rutka <pawel.rutka.ext@qorix.ai>
1 parent b2ae791 commit 401b83c

34 files changed

Lines changed: 2136 additions & 1106 deletions

.bazelrc

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ common --registry=https://bcr.bazel.build
77
common --credential_helper=*.qnx.com=%workspace%/.github/tools/qnx_credential_helper.py
88
common --credential_helper_timeout="60s"
99

10+
# Clear ANDROID_HOME for repository rules. rules_android (pulled transitively via
11+
# grpc-java -> rules_jvm_external) evaluates android_sdk_repository, which fails
12+
# when ANDROID_HOME points at an incomplete SDK (as on CI runners). None of our
13+
# code uses Android, so forcing it empty makes the rule emit an empty stub repo.
14+
common --repo_env=ANDROID_HOME=
15+
common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
16+
1017
# Java
1118
build --java_language_version=17
1219
build --tool_java_language_version=17
@@ -15,12 +22,12 @@ build --tool_java_runtime_version=remotejdk_17
1522

1623
build:_common --@score_baselibs//score/json:base_library=nlohmann
1724
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
18-
build:_common --@score_baselibs_rust//src/log:safety_level=qm
19-
build:_common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
25+
build:_common --@score_baselibs//src/log:safety_level=qm
26+
build:_common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
2027
build:_common --cxxopt=-Wno-error=mismatched-new-delete
2128
build:_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
22-
build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
2329
build:_common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0
30+
build:_common --extra_toolchains=//bazel/toolchains:score_ref_int_libclang_toolchain
2431

2532
# Flags needed by datarouter
2633
build:_common --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False
@@ -29,6 +36,7 @@ build:_common --@score_logging//score/datarouter/build_configuration_flags:enabl
2936
build:_common --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration=False
3037
build:_common --@score_logging//score/datarouter/build_configuration_flags:file_transfer=False
3138
build:_common --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True
39+
build:_common --@score_logging//score/datarouter/build_configuration_flags:dlt_output_enable=True
3240

3341
# ─── QNX common flags (shared by all QNX configs) ────────────────────────────
3442
build:_qnx_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
@@ -86,7 +94,7 @@ build:ferrocene-coverage --remote_download_all
8694

8795
# Persistency specific flags
8896
build:ferrocene-coverage-per --config=ferrocene-coverage
89-
build:ferrocene-coverage-per --@score_baselibs_rust//src/log:safety_level=qm
97+
build:ferrocene-coverage-per --@score_baselibs//src/log:safety_level=qm
9098
build:ferrocene-coverage-per --@score_baselibs//score/json:base_library=nlohmann
9199
build:ferrocene-coverage-per --@score_logging//score/mw/log/flags:KRemote_Logging=False
92100

@@ -98,7 +106,7 @@ test:itf-qnx-x86_64 --run_under=@score_itf//scripts:run_under_qemu
98106

99107
test:unit-tests --config=linux-x86_64
100108
test:unit-tests --build_tests_only
101-
test:unit-tests --test_tag_filters=-manual
109+
test:unit-tests --test_tag_filters=-manual,-miri
102110

103111
# Coverage configuration for C++
104112
coverage --features=coverage

BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ docs(
2222
"@score_orchestrator//:needs_json",
2323
"@score_kyron//:needs_json",
2424
# "@score_baselibs//:needs_json", # score_tooling is dev_dependency
25-
"@score_baselibs_rust//:needs_json",
2625
# "@score_communication//:needs_json", # no docs_sources
2726
# "@score_lifecycle_health//:needs_json", # unreadable images - relative paths issue
2827
"@score_logging//:needs_json", # duplicated labels

MODULE.bazel

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ include("//bazel_common:score_qnx_toolchains.MODULE.bazel") # WIP: Not used yet
2626
# Rust toolchains
2727
include("//bazel_common:score_rust_toolchains.MODULE.bazel")
2828

29+
# LLVM/libclang toolchain (provides libclang for the score_tooling C++ parser)
30+
include("//bazel_common:score_llvm_libclang.MODULE.bazel")
31+
2932
# Python support
3033
include("//bazel_common:score_python.MODULE.bazel")
3134

@@ -67,6 +70,14 @@ bazel_dep(name = "score_rust_policies", version = "0.0.5")
6770
bazel_dep(name = "trlc")
6871
git_override(
6972
module_name = "trlc",
70-
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
73+
commit = "8d25f639ff44976893d7866ba421a04db5698ebe",
7174
remote = "https://github.com/bmw-software-engineering/trlc.git",
7275
)
76+
77+
# Lobster dependency for requirements tracing (required by score_tooling)
78+
bazel_dep(name = "lobster", version = "0.0.0")
79+
git_override(
80+
module_name = "lobster",
81+
commit = "2792e2daee2cf524fdc7b1545fd3537791ebc36c",
82+
remote = "https://github.com/bmw-software-engineering/lobster.git",
83+
)

0 commit comments

Comments
 (0)