Skip to content

Move bazel overrides in own file #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ramceb wants to merge 4 commits into from
Closed

Move bazel overrides in own file #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cbff09
Cleanup bazel overrides
ramceb Mar 4, 2026
1b107bb
repo: fix `logging` build issues
arkjedrz Mar 4, 2026
64c6033
Fix dependency
ramceb Mar 4, 2026
69f7128
Renaming of files
ramceb Mar 4, 2026
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
4 changes: 2 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ build --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py

# Common test flags for all platforms
test --test_output=errors
test --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
test --@score_logging//score/mw/log/flags:KRemote_Logging=False
test --@score_baselibs//score/json:base_library=nlohmann
test --cxxopt=-Wno-deprecated-declarations

Expand All @@ -36,7 +36,7 @@ build:toolchain_common --incompatible_strict_action_env
build:toolchain_common --host_platform=@score_bazel_platforms//:x86_64-linux
## Ferrocene must be common compiler for HOST. To ensure metadata compatibility for proc macro crate
build:toolchain_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
build:stub --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
build:stub --@score_logging//score/mw/log/flags:KRemote_Logging=False
build:stub --@score_baselibs//score/json:base_library=nlohmann

# Target configuration for CPU:x86-64|OS:Linux build (do not use it in case of system toolchains!)
Expand Down
37 changes: 37 additions & 0 deletions DEV_OVERRIDES.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# *******************************************************************************
Copy link
Contributor

@pawelrutkaq pawelrutkaq Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why we need that change really? We dont have so big module file that this is issue

Copy link
Contributor Author

@ramceb ramceb Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should make it easier to enforce that we use git_overrides for development only.

# Copyright (c) 2026 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
git_override(
module_name = "score_crates",
commit = "c56d8f4006ff1cfe5be532496225255c5ee6c2d6",
remote = "https://github.com/eclipse-score/score-crates.git",
)

git_override(
module_name = "rules_rust",
commit = "293337fd6402ec3dfbeb8f2d589f38ad9124dadd",
remote = "https://github.com/pawelrutkaq/rules_rust.git", # To be fixed once rule_rust is in score bazel registry
)

git_override(
module_name = "flatbuffers",
commit = "187240970746d00bbd26b0f5873ed54d2477f9f3",
remote = "https://github.com/google/flatbuffers.git",
)

git_override(
module_name = "hedron_compile_commands",
commit = "0e990032f3c5a866e72615cf67e5ce22186dcb97",
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
# Replace the commit hash (above) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main).
# Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
)
37 changes: 13 additions & 24 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,23 +82,6 @@ bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = Tr

# S-CORE crates
bazel_dep(name = "score_crates", version = "0.0.8")
git_override(
module_name = "score_crates",
commit = "c56d8f4006ff1cfe5be532496225255c5ee6c2d6",
remote = "https://github.com/eclipse-score/score-crates.git",
)

git_override(
module_name = "rules_rust",
commit = "293337fd6402ec3dfbeb8f2d589f38ad9124dadd",
remote = "https://github.com/pawelrutkaq/rules_rust.git", # To be fixed once rule_rust is in score bazel registry
)

git_override(
module_name = "flatbuffers",
commit = "187240970746d00bbd26b0f5873ed54d2477f9f3",
remote = "https://github.com/google/flatbuffers.git",
)

deb = use_repo_rule("@download_utils//download/deb:defs.bzl", "download_deb")

Expand Down Expand Up @@ -128,14 +111,20 @@ use_repo(pip, "pip_score_venv_test")

bazel_dep(name = "score_baselibs_rust", version = "0.1.0")
bazel_dep(name = "score_baselibs", version = "0.2.4")
bazel_dep(name = "score_logging", version = "0.1.0")

# TODO: remove once inherited properly from `score_logging`.
bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
git_override(
module_name = "trlc",
commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release
remote = "https://github.com/bmw-software-engineering/trlc.git",
)

# Hedron's Compile Commands Extractor for Bazel
# https://github.com/hedronvision/bazel-compile-commands-extractor
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
git_override(
module_name = "hedron_compile_commands",
commit = "0e990032f3c5a866e72615cf67e5ce22186dcb97",
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
# Replace the commit hash (above) with the latest (https://github.com/hedronvision/bazel-compile-commands-extractor/commits/main).
# Even better, set up Renovate and let it do the work for you (see "Suggestion: Updates" in the README).
)

# this should be the last statement

include("//:OVERRIDES.MODULE.bazel")
Copy link
Contributor

@pawelrutkaq pawelrutkaq Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not allowed. This breaks usage of this module in another module or ? Only Root modules are allowed to include

Copy link
Contributor Author

@ramceb ramceb Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch. you are right :-) it's not allowed. So for releases we should comment this out, because releases shall not contain git_overrides. git_overrides shall only be used for development. Anyhow it's convenient to have a OVERRIDES.MODULE.bazel for development.

Loading
Loading