QNX Toolchain setup for eclipse-score-logging

.bazelrc

@@ -34,16 +34,34 @@ build --experimental_retain_test_configuration_across_testonly #https://github.c
 
 common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
 common --registry=https://bcr.bazel.build
-common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
+
+# Base QNX config (shared flags)
+common:qnx --host_platform=@score_bazel_platforms//:x86_64-linux
+common:qnx --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
+common:qnx --sandbox_writable_path=/var/tmp
 
 build:build_qnx8 --platforms=@score_bazel_platforms//:arm64-qnx8_0
 build:build_qnx8 --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
-build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0
-build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
 build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
+build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
+
+common:qnx_x86_64 --config=qnx
+common:qnx_x86_64 --platforms=@score_bazel_platforms//:x86_64-qnx8_0
+common:qnx_x86_64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
+common:qnx_x86_64 --extra_toolchains=@toolchains_qnx_qcc//:qcc_x86_64
+common:qnx_x86_64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
+
+common:qnx_arm64 --config=qnx
+common:qnx_arm64 --platforms=@score_bazel_platforms//:arm64-qnx8_0
+common:qnx_arm64 --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
+common:qnx_arm64 --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
+common:qnx_arm64 --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
+
+common:x86_64-qnx --config=qnx_x86_64
+common:arm64-qnx --config=qnx_arm64
 
 common --extra_toolchains=@gcc_toolchain//:host_gcc_12
-common --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux
+common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
 
 # With this instrumentation filter for our two main components, we ensure that `bazel coverage //...` is yielding the correct results
 coverage --instrumentation_filter="^//score/datarouter[/:],^//score/mw/log[/:],-//score/mw/.*/test[/:]"

.github/workflows/build_qnx8.yml

@@ -11,21 +11,36 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-name: QNX8 Build
+name: QNX8 Build and Test
+
 on:
   pull_request_target:
     types: [opened, reopened, synchronize]
-  merge_group:
-    types: [checks_requested]
+
 jobs:
-  qnx-build:
+  qnx-build-x86_64:
+    uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
+    permissions:
+      contents: read
+      pull-requests: read
+    with:
+      bazel-target: "//score/... //tests/..."
+      bazel-config: "x86_64-qnx"
+      credential-helper: "scripts/internal/qnx_creds.py"
+      environment-name: "workflow-approval"
+    secrets:
+      score-qnx-license: ${{ secrets.SCORE_QNX_LICENSE }}
+      score-qnx-user: ${{ secrets.SCORE_QNX_USER }}
+      score-qnx-password: ${{ secrets.SCORE_QNX_PASSWORD }}
+
+  qnx-build-arm64:
     uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
     permissions:
       contents: read
       pull-requests: read
     with:
-      bazel-target: "//score/..."
-      bazel-config: "build_qnx8"
+      bazel-target: "//score/... //tests/..."
+      bazel-config: "arm64-qnx"
       credential-helper: "scripts/internal/qnx_creds.py"
       environment-name: "workflow-approval"
     secrets:

MODULE.bazel

@@ -32,13 +32,12 @@ bazel_dep(name = "score_tooling", version = "1.0.4")
 bazel_dep(name = "score_rust_policies", version = "0.0.3")
 
 bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
-bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True)  # This is main score repo
+bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True)
 
 # Toolchains and extensions
 bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = True)
 bazel_dep(name = "score_toolchains_qnx", version = "0.0.6", dev_dependency = True)
-bazel_dep(name = "rust_qnx8_toolchain", version = "1.2.0", dev_dependency = True)
-bazel_dep(name = "score_toolchains_rust", version = "0.1.1", dev_dependency = True)
+bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
 
 # S-CORE crates
 bazel_dep(name = "score_crates", version = "0.0.6")
@@ -50,20 +49,6 @@ git_override(
     remote = "https://github.com/eclipse-score/tooling.git",
 )
 
-git_override(
-    module_name = "score_toolchains_rust",
-    commit = "bcf8e5364f72cf136ec81960350a82e2b5c45449",
-    remote = "https://github.com/eclipse-score/toolchains_rust.git",
-)
-
-archive_override(
-    module_name = "rust_qnx8_toolchain",
-    strip_prefix = "qnx8",
-    urls = [
-        "https://github.com/qorix-group/rust-lang-qnx8/releases/download/1.2.0/qnx8_rust_toolchain.tar.gz",
-    ],
-)
-
 # Extensions
 
 gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = True)