diff --git a/integration/.bazelrc b/integration/.bazelrc index f03197f6ef..aec75c2b12 100644 --- a/integration/.bazelrc +++ b/integration/.bazelrc @@ -3,7 +3,6 @@ common --registry=https://bcr.bazel.build common --credential_helper=*.qnx.com=%workspace%/scripts/qnx_credential_helper.py common --credential_helper_timeout="60s" -build:_common --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False build:_common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False build:_common --@score_baselibs//score/json:base_library=nlohmann build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False diff --git a/integration/bazel_common/score_modules.MODULE.bazel b/integration/bazel_common/score_modules.MODULE.bazel index 9b58a3d23d..8d1bbb7695 100644 --- a/integration/bazel_common/score_modules.MODULE.bazel +++ b/integration/bazel_common/score_modules.MODULE.bazel @@ -1,35 +1,34 @@ bazel_dep(name = "score_baselibs", version = "0.1.3") +git_override( + module_name = "score_baselibs", + remote = "https://github.com/eclipse-score/baselibs.git", + commit = "ffd1c812213c66a436ed982632f6942528b58be8", +) + bazel_dep(name = "score_communication", version = "0.1.1",) # EB needs 0.1.2 but others does not work with it +# git_override( +# module_name = "score_communication", +# remote = "https://github.com/eclipse-score/communication.git", +# commit = "0c0ea032995eaa766f5bdcec031bc02ee10d4587", # does not work due to nested dependencies logging -> docs +# ) + bazel_dep(name = "score_persistency", version = "0.2.1") -bazel_dep(name = "score_scrample", version = "0.1.0") +git_override( + module_name = "score_persistency", + remote = "https://github.com/eclipse-score/persistency.git", + commit = "9c1f0c1b1cd9b49621ecf4f9d541ded100fe2c08", +) + bazel_dep(name = "score_orchestrator") git_override( module_name = "score_orchestrator", remote = "https://github.com/eclipse-score/orchestrator.git", - commit = "18e136c34750c5db707f27f917d52efc7541e087", + commit = "6702f8c4bcabcc8802e62f07cccfd862991b1f8e", ) bazel_dep(name = "score_kyron") git_override( module_name = "score_kyron", remote = "https://github.com/eclipse-score/kyron.git", - commit = "ed312bdc6a50abc73f97b8c7e2ad4726fed06e81", + commit = "1da4672285a35d8e8a76c929b26531ea5e98fb96", ) - -git_override( - module_name = "score_persistency", - remote = "https://github.com/eclipse-score/persistency.git", - commit = "0037034bf853e5f955f028fab54ed319fb0441c3", -) - - -single_version_override( - module_name = "score_baselibs", - version = "0.1.3", - patch_strip = 1, - patches = [ - "//patches/baselibs:003-acl-fixes-for-aarch64.patch", - "//patches/baselibs:0001-RH-exception-header.patch", - "//patches/baselibs:0002-RH-algorithm-header.patch", - ], -) \ No newline at end of file diff --git a/integration/showcases/BUILD b/integration/showcases/BUILD index 3c85d9bee0..961018e790 100644 --- a/integration/showcases/BUILD +++ b/integration/showcases/BUILD @@ -16,7 +16,7 @@ score_pkg_bundle( name = "showcases_all", # package_dir = "", bins = ["//showcases/cli" ], - other_package_files = ["//showcases/standalone:standalone_pkg_files", "//showcases/kyron:kyron_pkg_files", "//showcases/orchestration_persistency:orch_per_pkg_files"], + other_package_files = ["//showcases/kyron:kyron_pkg_files", "//showcases/orchestration_persistency:orch_per_pkg_files"], ) diff --git a/integration/showcases/standalone/BUILD b/integration/showcases/standalone/BUILD deleted file mode 100644 index 5b4746fb26..0000000000 --- a/integration/showcases/standalone/BUILD +++ /dev/null @@ -1,8 +0,0 @@ -load("//bazel_common:bundlers.bzl", "score_pkg_bundle") - - -score_pkg_bundle( - name = "standalone", - package_dir = "standalone", - bins = ["@score_scrample//src:scrample"], -)