Skip to content

Commit bbfbc33

Browse files
authored
update to latest score_bazel_cpp_toolchains (#80)
* update to latest score_bazel_cpp_toolchains * fix builds, reduce logging builds * adapt other workflows, remove utests for logging * fix persistency test * add rust toolchain for feo * bin rust toolchain version
1 parent a69f96f commit bbfbc33

12 files changed

Lines changed: 104 additions & 106 deletions

.bazelrc

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,18 @@ common --registry=https://bcr.bazel.build
1717

1818
# Flags needed by score_baselibs and communication modules.
1919
# Do not add more!
20-
build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
21-
build --@score_baselibs//score/json:base_library=nlohmann
22-
build --@score_communication//score/mw/com/flags:tracing_library=stub
20+
common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
21+
common --@score_baselibs//score/json:base_library=nlohmann
22+
common --@score_communication//score/mw/com/flags:tracing_library=stub
23+
common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
24+
common --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False
25+
common --@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False
26+
common --@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False
27+
common --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False
28+
common --@score_logging//score/datarouter/build_configuration_flags:dlt_file_transfer_feature=False
29+
common --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True
30+
common --@score_logging//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
31+
common --@score_logging//score/mw/log/flags:KRemote_Logging=False
2332

2433
# stop legacy behavior of creating __init__.py files
2534
build --incompatible_default_to_explicit_init_py
@@ -29,12 +38,15 @@ build --experimental_retain_test_configuration_across_testonly #https://github.c
2938
test --test_tag_filters=-manual
3039
test --test_output=errors
3140

32-
build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux
41+
build:shared --sandbox_writable_path=/var/tmp
42+
build:shared --host_platform=@score_bazel_platforms//:x86_64-linux
3343

34-
# This config is for internal module usage ONLY.
35-
build:bl-x86_64-linux --config=_bl_common
36-
build:bl-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux
37-
build:bl-x86_64-linux --extra_toolchains=@gcc_toolchain//:host_gcc_12
44+
build:x86_64-linux --config=shared
45+
build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
46+
build:x86_64-linux --features=-treat_warnings_as_errors # due to baselibs deprecations
47+
48+
# this is deprecated, use build:x86_64-linux instead
49+
build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux
3850

3951
# This config is for internal module usage ONLY.
4052
build:bl-x86_64-qnx --config=_bl_common

.github/workflows/build_and_test_on_every_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
- name: Bazel execute showcase examples
4848
run: |
4949
set -e
50-
bazel build --config bl-x86_64-linux //feature_showcase:all_examples
50+
bazel build --config x86_64-linux //feature_showcase:all_examples
5151
while read -r target; do
52-
bazel run --config bl-x86_64-linux "$target"
52+
bazel run --config x86_64-linux "$target"
5353
done < ci/showcase_targets_run.txt
5454
- name: Feature Integration Tests
5555
run: |
56-
bazel test --config bl-x86_64-linux //feature_integration_tests/test_cases:fit
56+
bazel test --config x86_64-linux //feature_integration_tests/test_cases:fit

.github/workflows/release_verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
//:test_persistency_qemu \
6060
- name: Bazel execute showcase examples
6161
run: |
62-
bazel build --config bl-x86_64-linux //feature_showcase:all_examples
62+
bazel build --config x86_64-linux //feature_showcase:all_examples
6363
release_verification:
6464
runs-on: ubuntu-latest
6565
needs: [test_target]

.github/workflows/reusable_smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
fail-fast: false
139139
matrix:
140140
config:
141-
- bl-x86_64-linux
141+
- x86_64-linux
142142
# Add more configs here as needed
143143
# - bl-aarch64-linux
144144
# - bl-x86_64-qnx

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,22 @@ bazel run //:docs_combo_experimental
1818
```
1919
## Working Builds ✅
2020

21-
The following modules build successfully with the `bl-x86_64-linux` configuration:
21+
The following modules build successfully with the `x86_64-linux` configuration:
2222

2323
### Baselibs
2424
```bash
25-
bazel build --config bl-x86_64-linux @score_baselibs//score/... --verbose_failures
25+
bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures
26+
bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures
2627
```
2728

2829
### Communication
2930
```bash
30-
bazel build --config bl-x86_64-linux @score_communication//score/mw/com:com --verbose_failures
31+
bazel build --config x86_64-linux @score_communication//score/mw/com:com --verbose_failures
3132
```
3233

3334
### Persistency
3435
```bash
35-
bazel build --config bl-x86_64-linux \
36+
bazel build --config x86_64-linux \
3637
@score_persistency//src/cpp/src/... \
3738
@score_persistency//src/rust/... \
3839
--verbose_failures
@@ -43,18 +44,18 @@ bazel build --config bl-x86_64-linux \
4344
### Orchestration and `kyron` - async runtime for Rust
4445

4546
```bash
46-
bazel build --config bl-x86_64-linux @score_orchestrator//src/...
47+
bazel build --config x86_64-linux @score_orchestrator//src/...
4748
```
4849

4950
## Feature showcase examples
5051
The examples that are aiming to showcase features provided by S-CORE are located in `feature_showcase` folder.
51-
You can run them currently for host platform using `--config bl-x86_64-linux`.
52+
You can run them currently for host platform using `--config x86_64-linux`.
5253

5354
Execute `bazel query //feature_showcase/...` to obtain list of targets that You can run.
5455

5556

5657
```bash
57-
bazel build --config bl-x86_64-linux @score_orchestrator//src/... --verbose_failures
58+
bazel build --config x86_64-linux @score_orchestrator//src/... --verbose_failures
5859
```
5960

6061
## Operating system integrations
@@ -146,7 +147,7 @@ bazel build @feo//... --verbose_failures
146147

147148
### Persistency (Full Build)
148149
```bash
149-
bazel build --config bl-x86_64-linux @score_persistency//src/... --verbose_failures
150+
bazel build --config x86_64-linux @score_persistency//src/... --verbose_failures
150151
```
151152

152153
## System Dependencies

build_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"build_targets": "-- @score_feo//... -@score_feo//:docs -@score_feo//:ide_support -@score_feo//:needs_json"
2323
},
2424
"score_logging": {
25-
"build_targets": "@score_logging//score/... --@score_baselibs//score/memory/shared/flags:use_typedshmd=False --@score_baselibs//score/json:base_library=nlohmann --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False --@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False --@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False --@score_logging//score/datarouter/build_configuration_flags:dlt_file_transfer_feature=False --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True"
25+
"build_targets": "@score_logging//score/mw/log"
2626
}
2727
}
2828
}

known_good.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
"modules": {
33
"score_baselibs": {
44
"repo": "https://github.com/eclipse-score/baselibs.git",
5-
"hash": "ccfe7dc563bedc77fe6e19bd7050104e80fdf7e1"
5+
"hash": "fe74ff32f2cb8b2c99af019e7907ad9486e70b09"
66
},
77
"score_communication": {
88
"repo": "https://github.com/eclipse-score/communication.git",
9-
"hash": "1d3e115e953de771cfb6c780cf677cf3fe5e8bee"
9+
"hash": "73caa2d2b6f45f806bbd30bdf8675ab1ad551387"
1010
},
1111
"score_logging": {
1212
"repo": "https://github.com/eclipse-score/logging.git",
13-
"hash": "cddfb10832cf384ee5c3f8553fb898f56c1d1def"
13+
"hash": "8d14d2beec9bb3ccd7a2e24926eacd13b0ffc7d1"
1414
},
1515
"score_persistency": {
1616
"repo": "https://github.com/eclipse-score/persistency.git",
17-
"hash": "652f78a822dac698dcb60f80adbc3aea488ebee5"
17+
"hash": "69356def0bd731fda9aedc8c65336d8c2ca499da"
1818
},
1919
"score_orchestrator": {
2020
"repo": "https://github.com/eclipse-score/orchestrator.git",
21-
"hash": "dcf5518ac78d01cc06ed8a7ffe9e476c2fa43bd6"
21+
"hash": "18e136c34750c5db707f27f917d52efc7541e087"
2222
},
2323
"score_kyron": {
2424
"repo": "https://github.com/eclipse-score/kyron.git",
@@ -31,11 +31,11 @@
3131
},
3232
"score_tooling": {
3333
"repo": "https://github.com/eclipse-score/tooling.git",
34-
"hash": "092d229dbc671febe87ddce5c9763b1f62e2dbaf"
34+
"hash": "8894fe5440436a8c6d9e214c97b18d619c7f7eac"
3535
},
3636
"score_platform": {
3737
"repo": "https://github.com/eclipse-score/score.git",
38-
"hash": "dafe356f60f725ff77941c220200e1df28965d2d"
38+
"hash": "f4769c4b86bfe46b29b56b6c3e262c5b82db334b"
3939
},
4040
"score_bazel_platforms": {
4141
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
@@ -47,12 +47,12 @@
4747
},
4848
"score_docs_as_code": {
4949
"repo": "https://github.com/eclipse-score/docs-as-code.git",
50-
"hash": "d9f95fd2fdf2df494a8d499b5f061a84f320b53b"
50+
"hash": "a9babc30a7ab1ac43c75415b9784b2bc81ed0f9d"
5151
},
5252
"score_process": {
5353
"repo": "https://github.com/eclipse-score/process_description.git",
54-
"hash": "86f77b5514e32694efed3541558041b653830380"
54+
"hash": "496fb6dc347de414d9cbe7523204fdeb6b511197"
5555
}
5656
},
57-
"timestamp": "2026-01-21T08:46:20+00:00Z"
57+
"timestamp": "2026-01-26T11:01:36+00:00Z"
5858
}

score_modules.MODULE.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2026-01-21T08:46:20+00:00Z
14+
# Generated from known_good.json at 2026-01-26T16:26:12+00:00Z
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_baselibs")
1818
git_override(
1919
module_name = "score_baselibs",
2020
remote = "https://github.com/eclipse-score/baselibs.git",
21-
commit = "ccfe7dc563bedc77fe6e19bd7050104e80fdf7e1",
21+
commit = "efc061359d159244a9bd31a6f1dc74f9246c07b6",
2222
)
2323

2424
bazel_dep(name = "score_communication")
2525
git_override(
2626
module_name = "score_communication",
2727
remote = "https://github.com/eclipse-score/communication.git",
28-
commit = "1d3e115e953de771cfb6c780cf677cf3fe5e8bee",
28+
commit = "73caa2d2b6f45f806bbd30bdf8675ab1ad551387",
2929
)
3030

3131
bazel_dep(name = "score_logging")
3232
git_override(
3333
module_name = "score_logging",
3434
remote = "https://github.com/eclipse-score/logging.git",
35-
commit = "cddfb10832cf384ee5c3f8553fb898f56c1d1def",
35+
commit = "8d14d2beec9bb3ccd7a2e24926eacd13b0ffc7d1",
3636
)
3737

3838
bazel_dep(name = "score_persistency")
3939
git_override(
4040
module_name = "score_persistency",
4141
remote = "https://github.com/eclipse-score/persistency.git",
42-
commit = "652f78a822dac698dcb60f80adbc3aea488ebee5",
42+
commit = "0037034bf853e5f955f028fab54ed319fb0441c3",
4343
)
4444

4545
bazel_dep(name = "score_orchestrator")
4646
git_override(
4747
module_name = "score_orchestrator",
4848
remote = "https://github.com/eclipse-score/orchestrator.git",
49-
commit = "dcf5518ac78d01cc06ed8a7ffe9e476c2fa43bd6",
49+
commit = "18e136c34750c5db707f27f917d52efc7541e087",
5050
)
5151

5252
bazel_dep(name = "score_kyron")
@@ -67,14 +67,14 @@ bazel_dep(name = "score_tooling")
6767
git_override(
6868
module_name = "score_tooling",
6969
remote = "https://github.com/eclipse-score/tooling.git",
70-
commit = "092d229dbc671febe87ddce5c9763b1f62e2dbaf",
70+
commit = "8894fe5440436a8c6d9e214c97b18d619c7f7eac",
7171
)
7272

7373
bazel_dep(name = "score_platform")
7474
git_override(
7575
module_name = "score_platform",
7676
remote = "https://github.com/eclipse-score/score.git",
77-
commit = "dafe356f60f725ff77941c220200e1df28965d2d",
77+
commit = "a853a294f3fda8d40fde3ac76f60bd03fcdc6a4a",
7878
)
7979

8080
bazel_dep(name = "score_bazel_platforms")
@@ -95,12 +95,12 @@ bazel_dep(name = "score_docs_as_code")
9595
git_override(
9696
module_name = "score_docs_as_code",
9797
remote = "https://github.com/eclipse-score/docs-as-code.git",
98-
commit = "d9f95fd2fdf2df494a8d499b5f061a84f320b53b",
98+
commit = "f784d4370240cc0eafce779e5c317f6bf8988fb2",
9999
)
100100

101101
bazel_dep(name = "score_process")
102102
git_override(
103103
module_name = "score_process",
104104
remote = "https://github.com/eclipse-score/process_description.git",
105-
commit = "86f77b5514e32694efed3541558041b653830380",
105+
commit = "496fb6dc347de414d9cbe7523204fdeb6b511197",
106106
)

score_toolchains.MODULE.bazel

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,30 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# QNX toolchain
15-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.6")
16-
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx")
17-
toolchains_qnx.sdp(
18-
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
19-
strip_prefix = "installation",
20-
url = "https://www.qnx.com/download/download/79858/installation.tgz",
21-
)
22-
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
23-
use_repo(toolchains_qnx, "toolchains_qnx_qcc")
24-
use_repo(toolchains_qnx, "toolchains_qnx_ifs")
25-
register_toolchains(
26-
"@toolchains_qnx_ifs//:ifs_x86_64",
27-
"@toolchains_qnx_ifs//:ifs_aarch64",
28-
dev_dependency = True,
29-
)
3014

31-
#gcc toolchain for baselibs
32-
bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = False)
33-
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = False)
34-
# Align toolchain archive with persistency module (v0.0.3) so its labels (e.g. host_gcc_12) are present.
15+
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.0")
16+
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
17+
18+
# *******************************************************************************
19+
# Setting default GCC (CPU:x86_64|OS:Linux|V:12.2.0|ES:posix)
20+
# *******************************************************************************
3521
gcc.toolchain(
36-
url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/v0.0.3/x86_64-unknown-linux-gnu_gcc12.tar.gz",
37-
sha256 = "8fa85c2a93a6bef1cf866fa658495a2416dfeec692e4246063b791abf18da083",
38-
strip_prefix = "x86_64-unknown-linux-gnu",
22+
name = "score_gcc_toolchain",
23+
target_cpu = "x86_64",
24+
target_os = "linux",
25+
version = "12.2.0",
26+
use_default_package = True,
3927
)
40-
gcc.extra_features(
41-
features = [
42-
"minimal_warnings",
43-
"treat_warnings_as_errors",
44-
],
28+
29+
use_repo(
30+
gcc,
31+
"score_gcc_toolchain",
4532
)
46-
gcc.warning_flags(
47-
minimal_warnings = ["-Wall", "-Wno-error=deprecated-declarations", "-Wno-error=narrowing"],
48-
strict_warnings = ["-Wextra", "-Wpedantic"],
49-
treat_warnings_as_errors = ["-Werror"],
33+
34+
35+
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
36+
rust.toolchain(
37+
edition = "2021",
38+
versions = ["1.93.0"],
5039
)
51-
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
52-
register_toolchains("@gcc_toolchain//:all")
40+
use_repo(rust, "rust_toolchains")

scripts/integration_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ def main():
265265
)
266266
parser.add_argument(
267267
'--config',
268-
default=os.environ.get('CONFIG', 'bl-x86_64-linux'),
269-
help='Bazel config to use (default: bl-x86_64-linux, or from CONFIG env var)'
268+
default=os.environ.get('CONFIG', 'x86_64-linux'),
269+
help='Bazel config to use (default: x86_64-linux, or from CONFIG env var)'
270270
)
271271

272272
args = parser.parse_args()

0 commit comments

Comments
 (0)