Skip to content

Commit 46f7755

Browse files
authored
Merge branch 'main' into codeql_analysis
Signed-off-by: Frank Scholter Peres(MBTI) <[email protected]>
2 parents b5688e4 + f3644b6 commit 46f7755

File tree

9 files changed

+66
-36
lines changed

9 files changed

+66
-36
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ __pycache__/
2121
# Docs
2222
/_build
2323
/docs/ubproject.toml
24+
/docs/_collections

BUILD

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ load("@score_docs_as_code//:docs.bzl", "docs")
1616
docs(
1717
data = [
1818
"@score_platform//:needs_json",
19+
#"@score_persistency//:needs_json", # cannot be included, as it does not contain any needs?
20+
#"@score_orchestrator//:needs_json", # some issue about score_toolchains_qnx?
21+
#"@score_communication//:needs_json", # no docs yet?
22+
"@score_feo//:needs_json",
23+
"@score_docs_as_code//:needs_json",
1924
"@score_process//:needs_json",
20-
# Persistency cannot be included, as it does not contain any needs.
21-
# -> sphinx-needs bug?
22-
# "@score_persistency//:needs_json",
2325
],
2426
source_dir = "docs",
2527
)

docs/index.rst

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,21 @@ Release Notes: :need:`doc__score_v05_alpha_release_note`
2020

2121
.. if-collection:: score_platform
2222

23-
Documentation:
24-
2523
.. toctree::
2624
:maxdepth: 1
2725
:titlesonly:
26+
:caption: Platform and Modules
2827

2928
S-CORE Platform <_collections/score_platform/docs/index>
29+
place_holder/persistency
30+
place_holder/orchestrator
31+
place_holder/communication
32+
FEO <_collections/score_feo/docs/index>
33+
34+
.. toctree::
35+
:maxdepth: 1
36+
:titlesonly:
37+
:caption: Process, Methods, and Tools
38+
3039
_collections/score_process/process/index
40+
_collections/score_docs_as_code/docs/index
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
=============
2+
Communication
3+
=============
4+
5+
No communication available yet.

docs/place_holder/orchestrator.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
============
2+
Orchestrator
3+
============
4+
5+
Actual documentation is found here: https://eclipse-score.github.io/orchestrator/main/

docs/place_holder/persistency.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
===========
2+
Persistency
3+
===========
4+
5+
Actual documentation is found here: https://eclipse-score.github.io/persistency/main/

integration_test.sh

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ declare -A BUILD_TARGET_GROUPS=(
3333
[score_logging]="@score_logging//src/..."
3434
[score_orchestrator]="@score_orchestrator//src/..."
3535
[score_test_scenarios]="@score_test_scenarios//..."
36-
[score_feo]="@score_feo//..."
36+
[score_feo]="-- @score_feo//... -@score_feo//:docs -@score_feo//:ide_support -@score_feo//:needs_json"
3737
)
3838

3939

@@ -165,28 +165,11 @@ for group in "${!BUILD_TARGET_GROUPS[@]}"; do
165165
# Log build group banner only to stdout/stderr (not into summary table file)
166166
echo "--- Building group: ${group} ---"
167167
start_ts=$(date +%s)
168-
echo "bazel build --config "${CONFIG}" ${targets} --verbose_failures"
168+
echo "bazel build --verbose_failures --config "${CONFIG}" ${targets}"
169169
# GitHub Actions log grouping start
170170
echo "::group::Bazel build (${group})"
171171
set +e
172-
173-
build_command="bazel --output_base=\\\"${current_bazel_output_base}\\\" build \
174-
${targets} \
175-
--verbose_failures \
176-
--spawn_strategy=standalone \
177-
--nouse_action_cache \
178-
--noremote_accept_cached \
179-
--noremote_upload_local_results \
180-
--disk_cache= ${targets}"
181-
182-
codeql database create "${db_path}" \
183-
--language="${CODEQL_LANGUAGE}" \
184-
--build-mode=none \
185-
#--command="${build_command}" \
186-
--overwrite \
187-
|| { echo "CodeQL database creation failed for ${group}"; exit 1; }
188-
189-
172+
bazel build --verbose_failures --config "${CONFIG}" ${targets} 2>&1 | tee "$log_file"
190173
build_status=${PIPESTATUS[0]}
191174
# Track if any build group failed
192175
if [[ ${build_status} -ne 0 ]]; then

known_good.json

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,39 @@
33
"modules": {
44
"score_baselibs": {
55
"version": "0.1.3",
6+
"hash": "9457533471c8f0d4a1bb9435e91ff12c62d19c7c",
67
"repo": "https://github.com/eclipse-score/baselibs.git",
78
"branch": "s_core_release_v0_5_0"
89
},
910
"score_communication": {
1011
"version": "0.1.1",
1112
"repo": "https://github.com/eclipse-score/communication.git",
13+
"hash": "24d6e8916b89dbb405eae0b082348645d190dc18",
1214
"branch": "s_core_release_v0_5_0"
1315
},
1416
"score_persistency": {
1517
"version": "0.2.1",
18+
"hash": "7548876ed3e40ec3f3053c57634de68129287e05",
1619
"repo": "https://github.com/eclipse-score/persistency.git"
1720
},
1821
"score_orchestrator": {
1922
"version": "0.0.3",
23+
"hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6",
2024
"repo": "https://github.com/eclipse-score/orchestrator.git"
2125
},
26+
"score_kyron": {
27+
"hash": "caa9c0b367d18a09e969c1353e95a8c443ae896b",
28+
"repo": "https://github.com/eclipse-score/kyron.git"
29+
},
30+
"score_feo": {
31+
"version": "1.0.2",
32+
"hash": "4841281ab81aad114cfc86a19a69c029a274f28d",
33+
"repo": "https://github.com/eclipse-score/feo.git",
34+
"branch": "candidate_v0.5"
35+
},
2236
"score_tooling": {
2337
"version": "1.0.2",
38+
"hash": "64f81aaf9378e93be5209e52bf1bd149d6d7727f",
2439
"repo": "https://github.com/eclipse-score/tooling.git"
2540
},
2641
"score_platform": {
@@ -29,24 +44,23 @@
2944
},
3045
"score_bazel_platforms": {
3146
"version": "0.0.2",
47+
"hash": "0115193f958e8e592168df1e29cf86174bdba761",
3248
"repo": "https://github.com/eclipse-score/bazel_platforms.git"
3349
},
3450
"score_test_scenarios": {
3551
"version": "0.3.0",
52+
"hash": "a2f9cded3deb636f5dc800bf7a47131487119721",
3653
"repo": "https://github.com/eclipse-score/testing_tools.git"
3754
},
3855
"score_docs_as_code": {
3956
"version": "2.0.1",
57+
"hash": "bb52c96dd98799bdce68c166ad3b826f017f7cf6",
4058
"repo": "https://github.com/eclipse-score/docs-as-code.git"
4159
},
4260
"score_process": {
4361
"version": "1.3.1",
62+
"hash": "270e0ed0a2e560340f02b2f7046752cc937fe251",
4463
"repo": "https://github.com/eclipse-score/process_description.git"
45-
},
46-
"score_feo": {
47-
"version": "1.0.2",
48-
"repo": "https://github.com/eclipse-score/feo.git",
49-
"branch": "candidate_v0.5"
5064
}
5165
},
5266
"manifest_sha256": "4c9b7f...",

score_modules.MODULE.bazel

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ single_version_override(
4444
bazel_dep(name = "score_platform")
4545
single_version_override(
4646
module_name = "score_platform",
47-
version = "0.4.2",
47+
version = "0.5.0",
4848
)
4949

5050
bazel_dep(name = "score_bazel_platforms")
@@ -59,17 +59,16 @@ single_version_override(
5959
version = "0.3.0",
6060
)
6161

62-
bazel_dep(name = "score_docs_as_code", version = "2.0.1")
62+
bazel_dep(name = "score_docs_as_code")
6363
single_version_override(
6464
module_name = "score_docs_as_code",
65-
version = "2.0.1",
65+
version = "2.2.0",
6666
)
6767

68-
69-
bazel_dep(name = "score_process", version = "1.3.1")
68+
bazel_dep(name = "score_process")
7069
single_version_override(
7170
module_name = "score_process",
72-
version = "1.3.1",
71+
version = "1.3.2",
7372
)
7473

7574
bazel_dep(name = "score_feo", version = "1.0.2")
@@ -78,3 +77,9 @@ single_version_override(
7877
version = "1.0.2",
7978
)
8079

80+
bazel_dep(name = "score_kyron")
81+
git_override(
82+
module_name = "score_kyron",
83+
remote = "https://github.com/eclipse-score/kyron.git",
84+
commit = "c5837ac6612a5ebf91cd016775f2d3ee85ed6892",
85+
)

0 commit comments

Comments
 (0)