Skip to content

Commit 1b77a12

Browse files
committed
Merge remote-tracking branch 'origin/main' into codeql_analysis
# Conflicts: # known_good.json # score_modules.MODULE.bazel
2 parents 5c8546b + 43773c0 commit 1b77a12

File tree

5 files changed

+48
-37
lines changed

5 files changed

+48
-37
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "eclipse-s-core",
3-
"image": "ghcr.io/eclipse-score/devcontainer:1.0.0",
3+
"image": "ghcr.io/eclipse-score/devcontainer:v1.1.0",
44
"postStartCommand": "ssh-keygen -f '/home/vscode/.ssh/known_hosts' -R '[localhost]:2222' || true"
55
}

ebclfsa/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ single_version_override(
4444
bazel_dep(name = "score_baselibs")
4545
single_version_override(
4646
module_name = "score_baselibs",
47-
version = "0.1.3", # part of 0.5.0-alpha release
47+
version = "0.2.2", # part of 0.5.0-beta release
4848
patch_strip = 1,
4949
patches = [
5050
"//patches:fix_hard_coded_amd64.patch",
5151
],
5252
)
53-
bazel_dep(name = "score_communication", version = "0.1.1") # part of 0.5.0-alpha release
53+
bazel_dep(name = "score_communication", version = "0.1.2") # part of 0.5.0-beta release
5454
bazel_dep(name = "score_scrample", version = "0.1.0") # part of 0.5.0-alpha release
5555
bazel_dep(name = "score_persistency", version = "0.2.1") # part of 0.5.0-alpha release
5656

known_good.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"modules": {
44
"score_baselibs": {
55
"version": "0.2.2",
6-
"hash": "d072b126faa8ce2b6eaad88c6375b210fe42a547",
7-
"repo": "https://github.com/eclipse-score/baselibs.git"
8-
6+
"hash": "3c65b223e9f516f95935bb4cd2e83d6088ca016f",
7+
"repo": "https://github.com/eclipse-score/baselibs.git",
8+
"branch": "s_core_release_v0_5_0"
99
},
1010
"score_communication": {
1111
"version": "0.1.2",
1212
"repo": "https://github.com/eclipse-score/communication.git",
13-
"hash": "d5414f75bfd4fc116572091ccca305d9e4b39338"
14-
13+
"hash": "d5414f75bfd4fc116572091ccca305d9e4b39338",
14+
"branch": "s_core_release_v0_5_0"
1515
},
1616
"score_persistency": {
17-
"hash": "cc7da929bb3ddac4ac2c3e353cf88b2e711a504d",
17+
"version": "0.2.1",
18+
"hash": "7548876ed3e40ec3f3053c57634de68129287e05",
1819
"repo": "https://github.com/eclipse-score/persistency.git"
1920
},
2021
"score_orchestrator": {
21-
"version": "0.0.4",
22-
"hash": "92ee5ff22e571f2180a44edddcb81474e1ec68db",
22+
"version": "0.0.3",
23+
"hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6",
2324
"repo": "https://github.com/eclipse-score/orchestrator.git"
2425
},
2526
"score_kyron": {
26-
"version": "0.0.3",
27-
"hash": "558c5b5d8cd142baeafbfce15185c03b97e08eeb",
27+
"hash": "caa9c0b367d18a09e969c1353e95a8c443ae896b",
2828
"repo": "https://github.com/eclipse-score/kyron.git"
2929
},
3030
"score_feo": {
@@ -39,8 +39,7 @@
3939
"repo": "https://github.com/eclipse-score/tooling.git"
4040
},
4141
"score_platform": {
42-
"version": "0.5.1",
43-
"hash": "67b76ab7343ca067d7b60a75e0748892c4647690",
42+
"hash": "a9cf44be1342f3c62111de2249eb3132f5ab88da",
4443
"repo": "https://github.com/eclipse-score/score.git"
4544
},
4645
"score_bazel_platforms": {
@@ -49,18 +48,18 @@
4948
"repo": "https://github.com/eclipse-score/bazel_platforms.git"
5049
},
5150
"score_test_scenarios": {
52-
"version": "0.3.1",
53-
"hash": "55280e1376922aead6e09f32542f4e2d0b90cc51",
51+
"version": "0.3.0",
52+
"hash": "a2f9cded3deb636f5dc800bf7a47131487119721",
5453
"repo": "https://github.com/eclipse-score/testing_tools.git"
5554
},
5655
"score_docs_as_code": {
57-
"version": "2.2.0",
58-
"hash": "7a600fff3477d9940e9b50d8d6ac0b827e729ff7",
56+
"version": "2.0.1",
57+
"hash": "bb52c96dd98799bdce68c166ad3b826f017f7cf6",
5958
"repo": "https://github.com/eclipse-score/docs-as-code.git"
6059
},
6160
"score_process": {
62-
"version": "1.4.0",
63-
"hash": "d0570797b22649be2d2cdb603f2d70bdbff304ed",
61+
"version": "1.3.1",
62+
"hash": "270e0ed0a2e560340f02b2f7046752cc937fe251",
6463
"repo": "https://github.com/eclipse-score/process_description.git"
6564
}
6665
},

score_modules.MODULE.bazel

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

14-
# Generated from known_good.json at 2025-08-13T12:55:10Z
15-
# Do not edit manually - use tools/update_module_from_known_good.py
16-
1714
bazel_dep(name = "score_baselibs")
1815
single_version_override(
1916
module_name = "score_baselibs",
20-
version = "0.2.2",
17+
version = "0.2.2"
2118
)
2219

2320
bazel_dep(name = "score_communication")
@@ -26,11 +23,17 @@ single_version_override(
2623
version = "0.1.2",
2724
)
2825

26+
# bazel_dep(name = "score_logging", dev_dependency = True)
27+
# single_version_override(
28+
# module_name = "score_logging",
29+
# version = "0.0.3",
30+
# )
31+
2932
bazel_dep(name = "score_persistency")
3033
git_override(
3134
module_name = "score_persistency",
32-
remote = "https://github.com/eclipse-score/persistency.git",
33-
commit = "cc7da929bb3ddac4ac2c3e353cf88b2e711a504d",
35+
remote = "https://github.com/qorix-group/persistency.git",
36+
commit = "49089f1ac9d232f09eb65ca086b92f67e75aaff8",
3437
)
3538

3639
bazel_dep(name = "score_orchestrator")
@@ -45,22 +48,17 @@ single_version_override(
4548
version = "0.0.3",
4649
)
4750

48-
bazel_dep(name = "score_feo")
49-
single_version_override(
50-
module_name = "score_feo",
51-
version = "1.0.2",
52-
)
53-
5451
bazel_dep(name = "score_tooling")
5552
single_version_override(
5653
module_name = "score_tooling",
5754
version = "1.0.2",
5855
)
5956

6057
bazel_dep(name = "score_platform")
61-
single_version_override(
58+
git_override(
6259
module_name = "score_platform",
63-
version = "0.5.1",
60+
remote = "https://github.com/eclipse-score/score.git",
61+
commit = "45faa6781b5c7d292d885d4e2ad95eaf21c925c5",
6462
)
6563

6664
bazel_dep(name = "score_bazel_platforms")
@@ -86,3 +84,11 @@ single_version_override(
8684
module_name = "score_process",
8785
version = "1.4.0",
8886
)
87+
88+
bazel_dep(name = "score_feo", version = "1.0.2")
89+
single_version_override(
90+
module_name = "score_feo",
91+
version = "1.0.2",
92+
)
93+
94+
bazel_dep(name = "nlohmann_json", version = "3.11.3")

scripts/run_unit_tests.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ mkdir -p "${LOG_DIR}" || true
1111
declare -A UT_TARGET_GROUPS=(
1212
[baselibs]="@score_baselibs//score/... -- \
1313
-@score_baselibs//score/language/safecpp/aborts_upon_exception:abortsuponexception_toolchain_test \
14-
-@score_baselibs//score/containers:dynamic_array_test" # nok, error in @score_baselibs//score/json/examples:json_buffer
15-
[communication]="@score_communication//score/..." # nok, error from trlc in score_communication//score/mw/com/requirements/feature_requirements
14+
-@score_baselibs//score/containers:dynamic_array_test \
15+
-@score_baselibs//score/mw/log/configuration:* \
16+
-@score_baselibs//score/json/examples:*"
17+
[communication]="@score_communication//score/mw/com/impl/... -- \
18+
-@score_communication//score/mw/com/impl:unit_test_runtime_single_exec \
19+
-@score_communication//score/mw/com/impl/configuration:config_parser_test \
20+
-@score_communication//score/mw/com/impl/configuration:configuration_test \
21+
-@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test"
1622
[persistency]="@score_persistency//:unit_tests" # ok
1723
[orchestrator]="@score_orchestrator//src/..." # ok
1824
[kyron]="@score_kyron//:unit_tests" # ok

0 commit comments

Comments
 (0)