Skip to content

Commit 7f52a6b

Browse files
arkjedrzPiotrKorkusCopilotAlexanderLaninopajonk
authored
Release candidate 07 (#219)
Update Modules to the versions for SCORE v0.7 Use newer versions of tooling and configs. Update docs and release notes. --------- Signed-off-by: Piotr Korkus <piotr.korkus.ext@qorix.ai> Signed-off-by: Oliver Pajonk <oliver.pajonk@elektrobit.com> Co-authored-by: Piotr Korkus <piotr.korkus.ext@qorix.ai> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Alexander Lanin <Alexander.Lanin@etas.com> Co-authored-by: Oliver Pajonk <oliver.pajonk@elektrobit.com>
1 parent ff74697 commit 7f52a6b

28 files changed

Lines changed: 952 additions & 929 deletions

‎.bazelrc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ build --tool_java_runtime_version=remotejdk_17
1515

1616
build:_common --@score_baselibs//score/json:base_library=nlohmann
1717
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
18-
build:_common --@score_communication//score/mw/com/flags:tracing_library=stub
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
1920
build:_common --cxxopt=-Wno-error=mismatched-new-delete
2021
build:_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
2122
build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
@@ -69,6 +70,12 @@ test:ferrocene-coverage --run_under=@score_tooling//coverage:llvm_profile_wrappe
6970
# Coverage needs to have all intermediate .rlibs to be able to proceed
7071
build:ferrocene-coverage --remote_download_all
7172

73+
# Persistency specific flags
74+
build:ferrocene-coverage-per --config=ferrocene-coverage
75+
build:ferrocene-coverage-per --@score_baselibs_rust//src/log:safety_level=qm
76+
build:ferrocene-coverage-per --@score_baselibs//score/json:base_library=nlohmann
77+
build:ferrocene-coverage-per --@score_logging//score/mw/log/flags:KRemote_Logging=False
78+
7279
# Output only failed test logs
7380
test --test_output=errors
7481

‎.github/workflows/test_and_docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3535
jobs:
3636
test_and_docs:
37-
runs-on: ubuntu-22.04
37+
runs-on: ubuntu-latest
3838
permissions:
3939
contents: write # required to upload release assets
4040
pull-requests: write

‎BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ docs(
2121
"@score_persistency//:needs_json",
2222
"@score_orchestrator//:needs_json",
2323
"@score_kyron//:needs_json",
24-
"@score_baselibs//:needs_json",
24+
# "@score_baselibs//:needs_json", # score_tooling is dev_dependency
2525
"@score_baselibs_rust//:needs_json",
2626
# "@score_communication//:needs_json", # no docs_sources
2727
# "@score_lifecycle_health//:needs_json", # unreadable images - relative paths issue
28-
# "@score_logging//:needs_json", # duplicated labels
29-
"@score_logging//:needs_json",
28+
"@score_logging//:needs_json", # duplicated labels
3029
# Tools
3130
"@score_platform//:needs_json",
3231
"@score_process//:needs_json",
3332
"@score_docs_as_code//:needs_json",
3433
],
34+
known_good = "known_good.json",
3535
source_dir = "docs",
3636
)
3737

‎MODULE.bazel‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# *******************************************************************************
1313
module(
1414
name = "score_ref_int",
15-
version = "0.6.0",
15+
version = "0.7.0",
1616
compatibility_level = 0,
1717
)
1818

@@ -47,10 +47,23 @@ archive_override(
4747
urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
4848
)
4949

50+
# Implicit dependencies for score_communication
51+
bazel_dep(name = "download_utils", version = "1.2.2")
52+
53+
download_archive = use_repo_rule("@download_utils//download/archive:defs.bzl", "download_archive")
54+
55+
download_archive(
56+
name = "json_schema_validator",
57+
build = "//third_party/json_schema_validator:json_schema_validator.BUILD",
58+
dev_dependency = True,
59+
strip_prefix = "json-schema-validator-2.1.0",
60+
urls = ["https://github.com/pboettch/json-schema-validator/archive/refs/tags/2.1.0.tar.gz"],
61+
)
62+
5063
# Implicit dependencies for score_tooling
51-
bazel_dep(name = "aspect_rules_lint", version = "2.0.0")
52-
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
53-
bazel_dep(name = "score_rust_policies", version = "0.0.3")
64+
bazel_dep(name = "aspect_rules_lint", version = "2.3.0")
65+
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1")
66+
bazel_dep(name = "score_rust_policies", version = "0.0.5")
5467

5568
# TRLC dependency for requirements traceability
5669
bazel_dep(name = "trlc")

‎MODULE.bazel.lock‎

Lines changed: 403 additions & 731 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bazel_common/score_gcc_toolchains.MODULE.bazel‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.0")
15-
git_override(
16-
module_name = "score_bazel_cpp_toolchains",
17-
commit = "eba6b8c4b2d1d410a7f0cf8aae8b7938320bf6c8",
18-
remote = "https://github.com/eclipse-score/bazel_cpp_toolchains.git",
19-
)
14+
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.1")
2015

2116
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
2217
gcc.toolchain(

‎bazel_common/score_images.MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
bazel_dep(name = "rules_oci", version = "2.2.7")
1+
bazel_dep(name = "rules_oci", version = "2.3.0")
22

33
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
44
oci.pull(

‎bazel_common/score_modules_target_sw.MODULE.bazel‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,55 @@
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_baselibs")
18-
git_override(
18+
single_version_override(
1919
module_name = "score_baselibs",
20-
commit = "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e",
21-
patch_strip = 1,
22-
patches = [
23-
"//patches/baselibs:003-acl-fixes-for-aarch64.patch",
24-
],
25-
remote = "https://github.com/eclipse-score/baselibs.git",
20+
version = "0.2.7",
2621
)
2722

2823
bazel_dep(name = "score_baselibs_rust")
29-
git_override(
24+
single_version_override(
3025
module_name = "score_baselibs_rust",
31-
commit = "0eba2934fa8b0e1a343ec6bf6f7ff00cec27d81c",
32-
remote = "https://github.com/eclipse-score/baselibs_rust.git",
26+
version = "0.1.2",
3327
)
3428

3529
bazel_dep(name = "score_communication")
36-
git_override(
30+
single_version_override(
3731
module_name = "score_communication",
38-
commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
3932
patch_strip = 1,
4033
patches = [
4134
"//patches/communication:001-expose-comm-examples.patch",
35+
"//patches/communication:002-tests-visibility.patch",
36+
"//patches/communication:003-module-deps-visibility.patch",
4237
],
43-
remote = "https://github.com/eclipse-score/communication.git",
38+
version = "0.2.1",
4439
)
4540

4641
bazel_dep(name = "score_persistency")
47-
git_override(
42+
single_version_override(
4843
module_name = "score_persistency",
49-
commit = "438bf9b5c447fd41ad43b321679dd3d1b3a6c737",
50-
remote = "https://github.com/eclipse-score/persistency.git",
44+
version = "0.3.2",
5145
)
5246

5347
bazel_dep(name = "score_orchestrator")
54-
git_override(
48+
single_version_override(
5549
module_name = "score_orchestrator",
56-
commit = "600fdd8186305ffbf495e4fc788195c077de79ac",
57-
remote = "https://github.com/eclipse-score/orchestrator.git",
50+
version = "0.1.1",
5851
)
5952

6053
bazel_dep(name = "score_kyron")
61-
git_override(
54+
single_version_override(
6255
module_name = "score_kyron",
63-
commit = "5acfb1a593ec65cf4f64424f581c6ddd04813ee7",
64-
remote = "https://github.com/eclipse-score/kyron.git",
56+
version = "0.1.2",
6557
)
6658

6759
bazel_dep(name = "score_lifecycle_health")
68-
git_override(
60+
single_version_override(
6961
module_name = "score_lifecycle_health",
70-
commit = "757d17d4968ae3aebf6cd6981f8aeb875653a592",
71-
remote = "https://github.com/eclipse-score/lifecycle.git",
62+
version = "0.2.0",
7263
)
7364

7465
bazel_dep(name = "score_logging")
75-
git_override(
66+
single_version_override(
7667
module_name = "score_logging",
77-
commit = "80feaae8ffaa2448c3872011b724e1668ad2930e",
78-
remote = "https://github.com/eclipse-score/logging.git",
68+
version = "0.2.1",
7969
)

‎bazel_common/score_modules_tooling.MODULE.bazel‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,49 @@
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_crates")
18-
git_override(
18+
single_version_override(
1919
module_name = "score_crates",
20-
commit = "90539da0fd3e7e23e01f2b4de1679f7dfadd3b6b",
21-
remote = "https://github.com/eclipse-score/score-crates.git",
20+
version = "0.0.9",
2221
)
2322

2423
bazel_dep(name = "score_itf")
25-
git_override(
24+
single_version_override(
2625
module_name = "score_itf",
27-
commit = "1276f1818f926e2eb9cf234b61ff51d0c1da1e30",
28-
remote = "https://github.com/eclipse-score/itf.git",
26+
version = "0.3.0",
2927
)
3028

3129
bazel_dep(name = "score_tooling")
32-
git_override(
30+
single_version_override(
3331
module_name = "score_tooling",
34-
commit = "1159dcf9d35981ac4877265eff7a1e7a24452161",
35-
remote = "https://github.com/eclipse-score/tooling.git",
32+
version = "1.1.2",
3633
)
3734

3835
bazel_dep(name = "score_platform")
39-
git_override(
36+
single_version_override(
4037
module_name = "score_platform",
41-
commit = "bf8502071d750cb70d88f1cb5cfbf5e5e7407f27",
42-
remote = "https://github.com/eclipse-score/score.git",
38+
version = "0.5.5",
4339
)
4440

4541
bazel_dep(name = "score_bazel_platforms")
46-
git_override(
42+
single_version_override(
4743
module_name = "score_bazel_platforms",
48-
commit = "b72a5c3510ca423efc71fef9a93d82f974b089a4",
49-
remote = "https://github.com/eclipse-score/bazel_platforms.git",
44+
version = "0.1.2",
5045
)
5146

5247
bazel_dep(name = "score_test_scenarios")
53-
git_override(
48+
single_version_override(
5449
module_name = "score_test_scenarios",
55-
commit = "c3d385c8e5562b594a409e92a8f493207b53b49d",
56-
remote = "https://github.com/eclipse-score/testing_tools.git",
50+
version = "0.4.1",
5751
)
5852

5953
bazel_dep(name = "score_docs_as_code")
60-
git_override(
54+
single_version_override(
6155
module_name = "score_docs_as_code",
62-
commit = "c1207676afe6cafd25c35d420e73279a799515d8",
63-
remote = "https://github.com/eclipse-score/docs-as-code.git",
56+
version = "4.0.3",
6457
)
6558

6659
bazel_dep(name = "score_process")
67-
git_override(
60+
single_version_override(
6861
module_name = "score_process",
69-
commit = "fbe68f10041eb34fb791f08e31006afce8c9564a",
70-
remote = "https://github.com/eclipse-score/process_description.git",
62+
version = "1.5.4",
7163
)

‎bazel_common/score_rust_toolchains.MODULE.bazel‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,9 @@
1010
#
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
13-
bazel_dep(name = "rules_rust", version = "0.61.0")
13+
bazel_dep(name = "rules_rust", version = "0.68.1-score")
1414

15-
bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
16-
17-
git_override(
18-
module_name = "rules_rust",
19-
commit = "293337fd6402ec3dfbeb8f2d589f38ad9124dadd",
20-
remote = "https://github.com/pawelrutkaq/rules_rust.git", # To be fixed once rule_rust is in score bazel registry
21-
)
15+
bazel_dep(name = "score_toolchains_rust", version = "0.8.0", dev_dependency = True)
2216

2317
ferrocene = use_extension(
2418
"@score_toolchains_rust//extensions:ferrocene_toolchain_ext.bzl",

0 commit comments

Comments
 (0)