From ed7da09dedfa690b102419b5d817c34638fcfa80 Mon Sep 17 00:00:00 2001 From: Kai Graeper Date: Thu, 22 Jan 2026 17:36:42 +0100 Subject: [PATCH] update to latest score_bazel_cpp_toolchains --- .bazelrc | 13 +++--- .github/workflows/reusable_smoke-test.yml | 2 +- README.md | 17 ++++---- score_toolchains.MODULE.bazel | 50 +++++++---------------- scripts/integration_test.py | 4 +- 5 files changed, 35 insertions(+), 51 deletions(-) diff --git a/.bazelrc b/.bazelrc index 2be5855993..aaaf656d8a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -29,12 +29,15 @@ build --experimental_retain_test_configuration_across_testonly #https://github.c test --test_tag_filters=-manual test --test_output=errors -build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux +build:shared --sandbox_writable_path=/var/tmp +build:shared --host_platform=@score_bazel_platforms//:x86_64-linux -# This config is for internal module usage ONLY. -build:bl-x86_64-linux --config=_bl_common -build:bl-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux -build:bl-x86_64-linux --extra_toolchains=@gcc_toolchain//:host_gcc_12 +build:x86_64-linux --config=shared +build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix +build:x86_64-linux --features=-treat_warnings_as_errors # due to baselibs deprecations + +# this is deprecated, use build:x86_64-linux instead +build:_bl_common --host_platform=@score_bazel_platforms//:x86_64-linux # This config is for internal module usage ONLY. build:bl-x86_64-qnx --config=_bl_common diff --git a/.github/workflows/reusable_smoke-test.yml b/.github/workflows/reusable_smoke-test.yml index ac5326c99d..47dbef7f00 100644 --- a/.github/workflows/reusable_smoke-test.yml +++ b/.github/workflows/reusable_smoke-test.yml @@ -138,7 +138,7 @@ jobs: fail-fast: false matrix: config: - - bl-x86_64-linux + - x86_64-linux # Add more configs here as needed # - bl-aarch64-linux # - bl-x86_64-qnx diff --git a/README.md b/README.md index 18d238158f..a2b1b59224 100644 --- a/README.md +++ b/README.md @@ -18,21 +18,22 @@ bazel run //:docs_combo_experimental ``` ## Working Builds ✅ -The following modules build successfully with the `bl-x86_64-linux` configuration: +The following modules build successfully with the `x86_64-linux` configuration: ### Baselibs ```bash -bazel build --config bl-x86_64-linux @score_baselibs//score/... --verbose_failures +bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures +bazel build --config x86_64-linux @score_baselibs//score/... --verbose_failures ``` ### Communication ```bash -bazel build --config bl-x86_64-linux @score_communication//score/mw/com:com --verbose_failures +bazel build --config x86_64-linux @score_communication//score/mw/com:com --verbose_failures ``` ### Persistency ```bash -bazel build --config bl-x86_64-linux \ +bazel build --config x86_64-linux \ @score_persistency//src/cpp/src/... \ @score_persistency//src/rust/... \ --verbose_failures @@ -43,18 +44,18 @@ bazel build --config bl-x86_64-linux \ ### Orchestration and `kyron` - async runtime for Rust ```bash -bazel build --config bl-x86_64-linux @score_orchestrator//src/... +bazel build --config x86_64-linux @score_orchestrator//src/... ``` ## Feature showcase examples The examples that are aiming to showcase features provided by S-CORE are located in `feature_showcase` folder. -You can run them currently for host platform using `--config bl-x86_64-linux`. +You can run them currently for host platform using `--config x86_64-linux`. Execute `bazel query //feature_showcase/...` to obtain list of targets that You can run. ```bash -bazel build --config bl-x86_64-linux @score_orchestrator//src/... --verbose_failures +bazel build --config x86_64-linux @score_orchestrator//src/... --verbose_failures ``` ## Operating system integrations @@ -146,7 +147,7 @@ bazel build @feo//... --verbose_failures ### Persistency (Full Build) ```bash -bazel build --config bl-x86_64-linux @score_persistency//src/... --verbose_failures +bazel build --config x86_64-linux @score_persistency//src/... --verbose_failures ``` ## System Dependencies diff --git a/score_toolchains.MODULE.bazel b/score_toolchains.MODULE.bazel index 6a0207f842..b9c0738c38 100644 --- a/score_toolchains.MODULE.bazel +++ b/score_toolchains.MODULE.bazel @@ -11,42 +11,22 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -# QNX toolchain -bazel_dep(name = "score_toolchains_qnx", version = "0.0.6") -toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx") -toolchains_qnx.sdp( - sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63", - strip_prefix = "installation", - url = "https://www.qnx.com/download/download/79858/installation.tgz", -) -use_repo(toolchains_qnx, "toolchains_qnx_sdp") -use_repo(toolchains_qnx, "toolchains_qnx_qcc") -use_repo(toolchains_qnx, "toolchains_qnx_ifs") -register_toolchains( - "@toolchains_qnx_ifs//:ifs_x86_64", - "@toolchains_qnx_ifs//:ifs_aarch64", - dev_dependency = True, -) -#gcc toolchain for baselibs -bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = False) -gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = False) -# Align toolchain archive with persistency module (v0.0.3) so its labels (e.g. host_gcc_12) are present. +bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.0") +gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True) + +# ******************************************************************************* +# Setting default GCC (CPU:x86_64|OS:Linux|V:12.2.0|ES:posix) +# ******************************************************************************* gcc.toolchain( - url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/v0.0.3/x86_64-unknown-linux-gnu_gcc12.tar.gz", - sha256 = "8fa85c2a93a6bef1cf866fa658495a2416dfeec692e4246063b791abf18da083", - strip_prefix = "x86_64-unknown-linux-gnu", -) -gcc.extra_features( - features = [ - "minimal_warnings", - "treat_warnings_as_errors", - ], + name = "score_gcc_toolchain", + target_cpu = "x86_64", + target_os = "linux", + version = "12.2.0", + use_default_package = True, ) -gcc.warning_flags( - minimal_warnings = ["-Wall", "-Wno-error=deprecated-declarations", "-Wno-error=narrowing"], - strict_warnings = ["-Wextra", "-Wpedantic"], - treat_warnings_as_errors = ["-Werror"], + +use_repo( + gcc, + "score_gcc_toolchain", ) -use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc") -register_toolchains("@gcc_toolchain//:all") diff --git a/scripts/integration_test.py b/scripts/integration_test.py index ac1e043b56..866876bc0e 100755 --- a/scripts/integration_test.py +++ b/scripts/integration_test.py @@ -265,8 +265,8 @@ def main(): ) parser.add_argument( '--config', - default=os.environ.get('CONFIG', 'bl-x86_64-linux'), - help='Bazel config to use (default: bl-x86_64-linux, or from CONFIG env var)' + default=os.environ.get('CONFIG', 'x86_64-linux'), + help='Bazel config to use (default: x86_64-linux, or from CONFIG env var)' ) args = parser.parse_args()