-
Notifications
You must be signed in to change notification settings - Fork 34
build: integrate central S-CORE toolchain configuration #502
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.
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
Open
srinivasugithub
wants to merge
23
commits into
eclipse-score:main
Choose a base branch
from
bgsw-contrib:feature/S-CORE_global_toolchain_configuration
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
f767441
build: integrate central S-CORE toolchain configuration
srinivasugithub b49da28
Merge branch 'main' into feature/S-CORE_global_toolchain_configuration
srinivasugithub 3170058
build: fix QNX aarch64 toolchain package visibility in MODULE.bazel
srinivasugithub 24646a0
build: remove build report output
srinivasugithub f9b52bb
build(bazelrc): update central configurations
srinivasugithub 0525d37
build: resolve S-CORE global toolchain PR feedback
srinivasugithub b254360
build: adopt central toolchains and update templates
srinivasugithub 3b09136
Merge branch 'origin/main' into feature/S-CORE_global_toolchain_confiโฆ
srinivasugithub eefef53
Merge branch 'main' into feature/S-CORE_global_toolchain_configuration
srinivasugithub c4d5c9b
fix(lockfile): sync MODULE.bazel.lock after main merge
srinivasugithub 870b77b
build: adopt central S-CORE toolchain configuration
srinivasugithub 911b78a
fix(bazelrc): restore default private registry priority first
srinivasugithub d1e16c6
Merge branch 'main' into feature/S-CORE_global_toolchain_configuration
srinivasugithub dd6892c
fix(test_helper): suppress GTest verbose banner on stdout
srinivasugithub cdfe919
Merge branch 'upstream/main' into feature/S-CORE_global_toolchain_conโฆ
srinivasugithub 8f335ea
fix(build): align coverage configuration and tidy MODULE.bazel
srinivasugithub 3c20e08
build: revert QNX imagefs sdp_version to 8.0.0
kandukurisrinivasu 874ca35
Merge remote-tracking branch 'upstream/main' into pr/502
kandukurisrinivasu 5397b5c
fix(test_helper): restore GTest verbose banner suppression
kandukurisrinivasu 138e229
build: remove deleted patch overrides from MODULE.bazel
kandukurisrinivasu be92934
Merge branch 'main' into feature/S-CORE_global_toolchain_configuration
srinivasugithub 81b62fc
build: align and update MODULE.bazel dependencies with main
kandukurisrinivasu 2fb13e7
build: specify imagefs toolchain type
kandukurisrinivasu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,9 @@ build --java_runtime_version=remotejdk_17 | |
| build --tool_java_runtime_version=remotejdk_17 | ||
| build --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py | ||
|
|
||
| # Import central S-CORE toolchain configuration | ||
| import %workspace%/score.bazelrc/score_toolchain.bazelrc | ||
|
|
||
| # Disable warnings for external code | ||
| build --per_file_copt=external/.*@-w | ||
|
|
||
|
|
@@ -40,33 +43,24 @@ import %workspace%/quality/sanitizer/sanitizer.bazelrc | |
|
|
||
|
|
||
| # Common Lifecycle Toolchain flags for build (do not use it in case of system toolchains!) | ||
| 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_baselibs//score/json:base_library=nlohmann | ||
|
|
||
| # Target configuration for running tests on localhost | ||
| build:host --//config:integration_mode=host | ||
| build:host --//config:unit_mode=host | ||
|
|
||
| # Target configuration for CPU:x86-64|OS:Linux build (do not use it in case of system toolchains!) | ||
| # Target configuration for CPU:x86-64|OS:Linux build (leveraging central configuration) | ||
| build:x86_64-linux --config=stub | ||
| 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 | ||
| build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu | ||
| build:x86_64-linux --config=score-linux-x86_64 | ||
| build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu_miri | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs to be added to the common bazelrc (after this initial PR)? |
||
|
|
||
| test:x86_64-linux --//config:integration_mode=docker | ||
| test:x86_64-linux --//config:unit_mode=host | ||
|
|
||
| # Target configuration for CPU:AArch64|OS:Linux build (do not use it in case of system toolchains!) | ||
| # Target configuration for CPU:AArch64|OS:Linux build (repository-specific addition leveraging central configuration) | ||
| build:arm64-linux --config=stub | ||
| 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 | ||
| build:arm64-linux --config=score-linux-aarch64 | ||
| 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 | ||
|
|
@@ -75,13 +69,9 @@ build:arm64-linux --linkopt=-latomic | |
| test:arm64-linux --//config:integration_mode=docker | ||
| test:arm64-linux --//config:unit_mode=host | ||
|
|
||
| # Target configuration for CPU:x86-64|OS:QNX build (do not use it in case of system toolchains!) | ||
| # Target configuration for CPU:x86-64|OS:QNX build (leveraging central configuration) | ||
| build:x86_64-qnx --config=stub | ||
| build:x86_64-qnx --config=toolchain_common | ||
| build:x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix | ||
| build:x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0 | ||
| build:x86_64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800 | ||
| build:x86_64-qnx --extra_toolchains=@score_qnx_x86_64_ifs_toolchain//:ifs-x86_64-qnx-sdp_8.0.0 | ||
| build:x86_64-qnx --config=score-qnx-x86_64 | ||
|
|
||
| test:x86_64-qnx --//config:integration_mode=qemu | ||
| test:x86_64-qnx --//config:unit_mode=skip | ||
|
|
@@ -92,9 +82,9 @@ test:unit-tests-x86_64-qnx --run_under=@score_qnx_unit_tests//src:run_under_qnx | |
| test:unit-tests-x86_64-qnx --//config:integration_mode=skip | ||
| test:unit-tests-x86_64-qnx --//config:unit_mode=qemu | ||
|
|
||
| # Target configuration for CPU:AArch64|OS:QNX build (do not use it in case of system toolchains!) | ||
| # Target configuration for CPU:AArch64|OS:QNX build (repository-specific addition) | ||
| build:arm64-qnx --config=stub | ||
| build:arm64-qnx --config=toolchain_common | ||
| build:arm64-qnx --config=_score_common | ||
| build:arm64-qnx --incompatible_strict_action_env | ||
| build:arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix | ||
| build:arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here it's
x86_64-linuxand in the provided common config it'sscore-linux-x86_64?!Personally I don't have strong feelings, but I like the latter. We should align the naming (after this PR has landed).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer the former, but nevertheless we should use name from the common config so that it is the same between modules.