Update GCC & Rust toolchains (eclipse-score#42)

Use latest GCC and Rust S-CORE toolchains within FEO

Author: artemsheinacn

.bazelrc

@@ -21,6 +21,16 @@ test --test_output=errors
 common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
 common --registry=https://bcr.bazel.build
 
+common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
+common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
+
+# -------------------------------------------------------------------------------
+# Config dedicated to host platform CPU:x86_64 and OS:Linux
+# -------------------------------------------------------------------------------
+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
+
 # Clippy linting (enabled by default)
 build --aspects=@score_rust_policies//clippy:linters.bzl%clippy_strict
 build --output_groups=+rules_lint_human
@@ -29,12 +39,3 @@ build:lint --@aspect_rules_lint//lint:fail_on_violation=true
 build:lint-rust --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
 build:lint-rust --output_groups=+clippy_checks
 build:lint-rust --@rules_rust//:clippy.toml=//:clippy.toml
-
-common --extra_toolchains=@gcc_toolchain//:host_gcc_12
-build --incompatible_strict_action_env
-test --test_tag_filters=-manual
-build --experimental_retain_test_configuration_across_testonly #https://github.com/bazelbuild/bazel/issues/6842
-
-# unshare /dev/shm and /tmp
-test --sandbox_tmpfs_path=/dev/shm
-test --sandbox_tmpfs_path=/tmp

.github/workflows/ci.yml

@@ -40,10 +40,10 @@ jobs:
         run: bazel mod tidy
 
       - name: Build all workspace targets
-        run: bazel build //...
+        run: bazel build --config=x86_64-linux //...
 
       - name: Run all workspace tests
-        run: bazel test //...
+        run: bazel test --config=x86_64-linux //...
 
       - name: Lint rust code (with clippy)
         run: bazel build --config=lint-rust //...

MODULE.bazel

@@ -16,6 +16,9 @@ module(
     compatibility_level = 1,
 )
 
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
+
 # SCORE bazel module dependencies
 bazel_dep(name = "score_tooling", version = "1.1.0")
 bazel_dep(name = "score_crates", version = "0.0.6")
@@ -24,9 +27,6 @@ bazel_dep(name = "score_crates", version = "0.0.6")
 bazel_dep(name = "rules_rust", version = "0.67.0")
 bazel_dep(name = "rules_rust_prost", version = "0.67.0")
 
-# C/C++ rules for Bazel
-bazel_dep(name = "rules_cc", version = "0.2.8")
-
 # Protobuf
 # Repo_name override is needed here for compatibility with WORKSPACE (e.g.for rules_rust_prost)
 # Newer protobuf versions generate warnings during compilation which will cause the build failure due
@@ -42,50 +42,35 @@ bazel_dep(name = "googletest", version = "1.17.0")
 bazel_dep(name = "score_docs_as_code", version = "3.0.0")
 
 # Toolchains
-# GCC toolchain
-bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = True)
+bazel_dep(name = "rules_cc", version = "0.2.16")
+
+bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
 
-gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = True)
+# Extensions
+gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
 gcc.toolchain(
-    sha256 = "457f5f20f57528033cb840d708b507050d711ae93e009388847e113b11bf3600",
-    strip_prefix = "x86_64-unknown-linux-gnu",
-    url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/0.0.1/x86_64-unknown-linux-gnu_gcc12.tar.gz",
+    name = "score_gcc_x86_64_toolchain",
+    target_cpu = "x86_64",
+    target_os = "linux",
+    use_default_package = True,
+    version = "12.2.0",
 )
-
-# TODO to be moved to toolchain. https://github.com/eclipse-score/toolchains_gcc/issues/11
-gcc.extra_features(
-    features = [
-        "minimal_warnings",
-        "treat_warnings_as_errors",
-    ],
+gcc.toolchain(
+    name = "score_gcc_aarch64_toolchain",
+    target_cpu = "aarch64",
+    target_os = "linux",
+    use_default_package = True,
+    version = "12.2.0",
 )
-gcc.warning_flags(
-    minimal_warnings = [
-        "-Wall",
-        "-Wno-error=deprecated-declarations",
-    ],
-    strict_warnings = [
-        "-Wextra",
-        "-Wpedantic",
-    ],
-    treat_warnings_as_errors = ["-Werror"],
+use_repo(
+    gcc,
+    "score_gcc_aarch64_toolchain",
+    "score_gcc_x86_64_toolchain",
 )
-use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
 
 # Rust toolchain
-RUST_EDITION = "2024"
-
-RUST_VERSION = "1.93.0"
-
-# Shared Rust policies (Clippy config, etc.), overridden locally during development.
-bazel_dep(name = "score_rust_policies", version = "0.0.4", dev_dependency = True)
-
-rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
-rust.toolchain(
-    edition = RUST_EDITION,
-    versions = [RUST_VERSION],
-)
-use_repo(rust, "rust_toolchains")
+bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
+bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True)
 
 # Prost toolchain
 register_toolchains("//toolchain/prost:prost_toolchain")

examples/rust/mini-adas/src/activities/components.rs

@@ -380,13 +380,13 @@ impl Activity for BrakeController {
         debug!("Stepping BrakeController");
         sleep_random();
 
-        if let Ok(brake_instruction) = self.input_brake_instruction.read()
-            && brake_instruction.active
-        {
-            debug!(
-                "BrakeController activating brakes with level {:.3}",
-                brake_instruction.level
-            )
+        if let Ok(brake_instruction) = self.input_brake_instruction.read() {
+            if brake_instruction.active {
+                debug!(
+                    "BrakeController activating brakes with level {:.3}",
+                    brake_instruction.level
+                )
+            }
         }
         Ok(())
     }

feo/src/scheduler.rs

@@ -360,10 +360,10 @@ impl Scheduler {
                 );
                 break;
             }
-            if let Ok(Some(Signal::TerminateAck(agent_id))) = self.connector.receive(self.receive_timeout)
-                && pending_agent_acks.remove(&agent_id)
-            {
-                info!("Received TerminateAck from agent {}", agent_id);
+            if let Ok(Some(Signal::TerminateAck(agent_id))) = self.connector.receive(self.receive_timeout) {
+                if pending_agent_acks.remove(&agent_id) {
+                    info!("Received TerminateAck from agent {}", agent_id);
+                }
             }
         }
 

feo/src/signalling/common/socket/connection.rs

@@ -83,20 +83,20 @@ where
 {
     /// Try to read from this connection
     pub(crate) fn read(&mut self) -> io::Result<Option<M>> {
-        if self.buffer_readable
-            && let Some(msg) = self.parse_from_buffer()
-        {
-            return Ok(Some(msg));
+        if self.buffer_readable {
+            if let Some(msg) = self.parse_from_buffer() {
+                return Ok(Some(msg));
+            }
         }
 
         if self.stream_readable {
             self.read_from_stream()?;
         }
 
-        if self.buffer_readable
-            && let Some(msg) = self.parse_from_buffer()
-        {
-            return Ok(Some(msg));
+        if self.buffer_readable {
+            if let Some(msg) = self.parse_from_buffer() {
+                return Ok(Some(msg));
+            }
         }
 
         Ok(None)

pre_commit.sh

@@ -23,5 +23,5 @@ bazelisk run //:format.fix
 bazelisk run  //:format.check_Rust_with_rustfmt
 bazelisk run //:copyright.check
 bazelisk build --config=lint-rust //...
-bazelisk build //...
-bazelisk test //...
+bazelisk build --config=x86_64-linux //...
+bazelisk test --config=x86_64-linux //...