Skip to content

Commit 37aa2fc

Browse files
authored
Merge pull request #29 from Elektrobit/add_scrample_to_ebclfsa
Replace ipc_bridge with scrample code
2 parents dd61c44 + 1332944 commit 37aa2fc

File tree

18 files changed

+105
-1296
lines changed

18 files changed

+105
-1296
lines changed

.github/workflows/build_and_test_ebclfsa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
uses: actions/checkout@v4
3232

3333
- name: Build for EB corbos Linux for Safety Applications and run tests
34-
run: bazel build --config=aarch64 --spawn_strategy=local //example/ipc_bridge_hi_wrapper:run_example
34+
run: bazel build --config=aarch64 --spawn_strategy=local //scrample_integration:run
3535
working-directory: ./ebclfsa
3636

3737
- name: Upload test logs
3838
uses: actions/upload-artifact@v5
3939
with:
4040
name: test-logs
41-
path: ebclfsa/bazel-bin/example/ipc_bridge_hi_wrapper/*.log
41+
path: ebclfsa/bazel-bin/scrample_integration/*.log

ebclfsa/MODULE.bazel

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ module(
1919
compatibility_level = 0,
2020
)
2121

22-
bazel_dep(name = "rules_cc", version = "0.2.0")
22+
bazel_dep(name = "rules_cc", version = "0.2.1")
2323

24-
bazel_dep(name = "score_toolchains_gcc", version = "0.0.0", dev_dependency=True)
25-
git_override(
24+
bazel_dep(name = "score_toolchains_gcc", dev_dependency=True)
25+
git_override( # Elektrobit corbos Linux for Safety Applications needs a specific toolchain
2626
module_name = "score_toolchains_gcc",
2727
remote = "https://github.com/Elektrobit/eclipse-score_toolchains_gcc.git",
28-
commit = "fb009e490b9b8f28805d587f50d0bf6d885f3414",
28+
tag = "0.5.0-alpha", # commit sha: fb009e490b9b8f28805d587f50d0bf6d885f3414
2929
)
3030
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency=True)
3131
gcc.toolchain(
32-
url = "https://linux.elektrobit.com/tmp/score/fastdev-sdk-ubuntu-ebcl-deb-qemu-arm64.tar.xz",
32+
url = "https://github.com/Elektrobit/eclipse-score_toolchains_gcc/releases/download/0.5.0-alpha/fastdev-sdk-ubuntu-ebcl-deb-qemu-arm64.tar.xz",
3333
sha256 = "cf8d277a2b95bbdad3e177c488fa77d01723510690a911218ef33747574d78fe",
3434
strip_prefix = "fastdev-sdk-ubuntu-ebcl-deb-qemuarm64",
3535
)
@@ -49,34 +49,28 @@ gcc.warning_flags(
4949

5050
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
5151

52-
53-
bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost")
54-
archive_override(
55-
module_name = "rules_boost",
56-
urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
57-
strip_prefix = "rules_boost-master",
58-
)
59-
60-
bazel_dep(name = "boost.program_options", version = "1.87.0")
61-
6252
bazel_dep(name = "score_baselibs")
6353
single_version_override(
6454
module_name = "score_baselibs",
65-
version = "0.1.3",
55+
version = "0.1.3", # part of 0.5.0-alpha release
6656
patch_strip = 1,
6757
patches = [
6858
"//patches:fix_hard_coded_amd64.patch",
6959
],
7060
)
71-
bazel_dep(name = "score_communication")
72-
single_version_override(
73-
module_name = "score_communication",
74-
version = "0.1.1",
75-
)
61+
bazel_dep(name = "score_communication", version = "0.1.1") # part of 0.5.0-alpha release
62+
bazel_dep(name = "score_scrample", version = "0.1.0") # part of 0.5.0-alpha release
7663

77-
# git_override are not forwarded by bazel_dep, so we need to redefine it here
64+
# git_override is not forwarded by bazel_dep, so we need to redefine it here
7865
git_override(
7966
module_name = "trlc",
8067
remote = "https://github.com/bmw-software-engineering/trlc.git",
8168
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
8269
)
70+
71+
# archive_override is not forwarded by bazel_dep, so we need to redefine it here
72+
archive_override(
73+
module_name = "rules_boost",
74+
urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
75+
strip_prefix = "rules_boost-master",
76+
)

ebclfsa/README.md

Lines changed: 58 additions & 49 deletions
Large diffs are not rendered by default.

ebclfsa/example/ipc_bridge/BUILD

Lines changed: 0 additions & 65 deletions
This file was deleted.

ebclfsa/example/ipc_bridge/assert_handler.cpp

Lines changed: 0 additions & 69 deletions
This file was deleted.

ebclfsa/example/ipc_bridge/assert_handler.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

ebclfsa/example/ipc_bridge/datatype.cpp

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)