Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/prepare_workspace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ export GITA_PROJECT_HOME

# Generate workspace metadata files from known_good.json:
# - .gita-workspace.csv
python3 tools/known_good_to_workspace_metadata.py --known-good known_good.json --gita-workspace .gita-workspace.csv
python3 scripts/known_good/known_good_to_workspace_metadata.py --known-good known_good.json --gita-workspace .gita-workspace.csv
14 changes: 7 additions & 7 deletions .github/workflows/reusable_integration-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
# What it does:
# - Checks out the reference integration repository
# - Updates score_modules.MODULE.bazel from the provided known_good.json
# - Builds all referenced modules (via scripts/integration_test.sh and Bazel)
# - Builds all referenced modules (via scripts/integration_test.py and Bazel)
# - Runs integration tests
# - Uploads logs from _logs/ as artifact: bazel-build-logs-${{ inputs.config }}
#
# Inputs:
# - known_good (string, required): JSON content used to pin module SHAs.
# - config (string, optional, default: bl-x86_64-linux): Bazel config passed as
# CONFIG to scripts/integration_test.sh.
# - config (string, optional, default: bl-x86_64-linux): Bazel config passed to
# scripts/integration_test.py.
# - repo_runner_labels (string, optional): Runner label(s). Accepts either a
# single label string (e.g., ubuntu-latest) or a JSON string representing a
# label or an array of labels (e.g., "\"ubuntu-latest\"" or
# "[\"self-hosted\",\"linux\",\"x64\"]").
# - target_branch (string, optional, default: main): Ref/branch to checkout.
#
# Repository Variables:
# - reference_integration_repo (optional): Repository to checkout (owner/repo).
# - REFERENCE_INTEGRATION_REPO (optional): Repository to checkout (owner/repo).
# Default: eclipse-score/reference_integration
#
# Secrets:
Expand Down Expand Up @@ -77,7 +77,7 @@ on:
default: 'main'

env:
REFERENCE_INTEGRATION_REPO: ${{ vars.reference_integration_repo != '' && vars.reference_integration_repo || 'eclipse-score/reference_integration' }}
REFERENCE_INTEGRATION_REPO: ${{ vars.REFERENCE_INTEGRATION_REPO != '' && vars.REFERENCE_INTEGRATION_REPO || 'eclipse-score/reference_integration' }}

jobs:
integration-test:
Expand Down Expand Up @@ -127,14 +127,14 @@ jobs:
echo "::endgroup::"

echo "::group::update score_modules.MODULE.bazel"
python3 tools/update_module_from_known_good.py --known known_good.updated.json
python3 scripts/known_good/update_module_from_known_good.py --known known_good.updated.json
cat score_modules.MODULE.bazel
echo "::endgroup::"
env:
GITHUB_TOKEN: ${{ secrets.REPO_READ_TOKEN != '' && secrets.REPO_READ_TOKEN || github.token }}
- name: Bazel build targets
run: |
CONFIG="${{ inputs.config }}" scripts/integration_test.sh --known-good known_good.updated.json
python3 scripts/integration_test.py --known-good known_good.updated.json --config "${{ inputs.config }}"
env:
GITHUB_TOKEN: ${{ secrets.REPO_READ_TOKEN != '' && secrets.REPO_READ_TOKEN || github.token }}
- name: Show disk space after build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ jobs:
run: |
if [ "${{ github.repository }}" != "${{ env.REFERENCE_INTEGRATION_REPO }}" ]; then
echo "Overriding ${{ inputs.module_name }} with current PR"
python3 tools/override_known_good_repo.py \
python3 scripts/known_good/override_known_good_repo.py \
--known known_good.json \
--output known_good.updated.json \
--module-override ${{ inputs.module_name }}@${{ github.event.repository.clone_url }}@${{ github.sha }}
else
echo "Testing reference integration repository itself - updating to latest commits"
echo "::group::get latest commits from module branches"
python3 tools/update_module_latest.py --output known_good.updated.json
python3 scripts/known_good/update_module_latest.py --output known_good.updated.json
cat known_good.updated.json
echo "::endgroup::"
fi
Expand Down
6 changes: 3 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "shell",
"command": "python3",
"args": [
"tools/known_good_to_workspace_metadata.py"
"scripts/known_good/known_good_to_workspace_metadata.py"
],
"problemMatcher": []
},
Expand All @@ -15,7 +15,7 @@
"type": "shell",
"command": "python3",
"args": [
"tools/update_module_from_known_good.py",
"scripts/known_good/update_module_from_known_good.py",
"--override-type",
"local_path"
],
Expand All @@ -26,7 +26,7 @@
"type": "shell",
"command": "python3",
"args": [
"tools/update_module_from_known_good.py",
"scripts/known_good/update_module_from_known_good.py",
"--override-type",
"git"
]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,4 @@ local_path_override(module_name = "score_tooling", path = "../tooling")
Use `scripts/generate_rust_analyzer_support.sh` to generate rust_analyzer settings that will let VS Code work.

## 🗂 Notes
Keep this file updated as integration issues are resolved. Prefer converting ad-hoc shell steps into Bazel rules or documented scripts under `tools/` for repeatability.
Keep this file updated as integration issues are resolved. Prefer converting ad-hoc shell steps into Bazel rules or documented scripts under `scripts/` for repeatability.
28 changes: 28 additions & 0 deletions build_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"modules": {
"score_baselibs": {
"build_targets": "@score_baselibs//score/..."
},
"score_communication": {
"build_targets": "@score_communication//score/mw/com:com"
},
"score_persistency": {
"build_targets": "@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
},
"score_kyron": {
"build_targets": "@score_kyron//src/..."
},
"score_orchestrator": {
"build_targets": "@score_orchestrator//src/..."
},
"score_test_scenarios": {
"build_targets": "@score_test_scenarios//test_scenarios_rust:test_scenarios_rust @score_test_scenarios//test_scenarios_cpp:test_scenarios_cpp"
},
"score_feo": {
"build_targets": "-- @score_feo//... -@score_feo//:docs -@score_feo//:ide_support -@score_feo//:needs_json"
},
"score_logging": {
"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"
}
}
}
1 change: 1 addition & 0 deletions scripts/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Scripts package
Loading
Loading