Skip to content
Draft
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: 2 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ build:x86_64-linux --config=toolchain_common
build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
build:x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu_miri
build:x86_64-linux --define config=x86_64-linux

# Target configuration for CPU:AArch64|OS:Linux build (do not use it in case of system toolchains!)
Expand All @@ -56,6 +57,7 @@ build:arm64-linux --config=toolchain_common
build:arm64-linux --platforms=@score_bazel_platforms//:aarch64-linux-gcc_12.2.0-posix
build:arm64-linux --extra_toolchains=@score_gcc_aarch64_toolchain//:aarch64-linux-gcc_12.2.0-posix
build:arm64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_linux_gnu
build:arm64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_linux_gnu_miri
build:arm64-linux --copt=-mno-outline-atomics
build:arm64-linux --linkopt=-latomic

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
with:
bazel-target: "//score/..."
bazel-config: "x86_64-linux"
extra-bazel-flags: "--test_output=errors --nocache_test_results --lockfile_mode=error"
extra-bazel-flags: "--test_output=errors --nocache_test_results --lockfile_mode=error --test_lang_filters=-rust,-miri"
artifact-name-suffix: "_cpp"
retention-days: 10
min-coverage: 76
rust:
uses: eclipse-score/cicd-workflows/.github/workflows/rust-coverage.yml@c1c90b1a82a1fab0fc202979dde6686b2162d5a8 # v0.0.0
with:
bazel-test-targets: "//score/..."
bazel-test-config-flags: "--config=x86_64-linux --config=ferrocene-coverage --lockfile_mode=error"
bazel-test-config-flags: "--config=x86_64-linux --config=ferrocene-coverage --lockfile_mode=error --test_lang_filters=-cc,-miri"
bazel-test-args: "--test_output=errors --nocache_test_results"
coverage-target: "//:rust_coverage"
coverage-artifact-name: "rust-coverage-html"
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/miri.yml

This file was deleted.

4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module(
bazel_dep(name = "bazel_skylib", version = "1.9.0")
bazel_dep(name = "rules_pkg", version = "1.1.0")
bazel_dep(name = "rules_python", version = "1.8.5")
bazel_dep(name = "rules_rust", version = "0.68.1-score")
bazel_dep(name = "rules_rust", version = "0.68.2-score")
bazel_dep(name = "rules_cc", version = "0.2.17")
bazel_dep(name = "rules_oci", version = "2.3.0")
bazel_dep(name = "aspect_rules_lint", version = "2.0.0")
Expand Down Expand Up @@ -82,7 +82,7 @@ use_repo(
)

## Rust Toolchain
bazel_dep(name = "score_toolchains_rust", version = "0.8.0", dev_dependency = True)
bazel_dep(name = "score_toolchains_rust", version = "0.9.1", dev_dependency = True)

# S-CORE crates
bazel_dep(name = "score_crates", version = "0.0.9")
Expand Down
783 changes: 332 additions & 451 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion score/health_monitor/src/rust/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

load("@rules_rust//rust:defs.bzl", "rust_library", "rust_static_library", "rust_test")
load("@rules_rust//rust:defs.bzl", "miri_test", "rust_library", "rust_static_library", "rust_test")

COMMON_RUST_DEPS = [
"@score_baselibs_rust//src/containers:containers",
Expand Down Expand Up @@ -103,3 +103,18 @@ rust_test(
"@score_crates//:loom",
],
)

miri_test(
name = "miri_tests",
crate = ":tests",
miri_flags = [
"-Zmiri-ignore-leaks",
"-Zmiri-disable-isolation",
'--cfg=feature="stub_supervisor_api_client"',
],
tags = [
"miri",
"no-asan",
],
target_compatible_with = ["@platforms//os:linux"],
)
Loading