Skip to content

Commit 5b7d963

Browse files
Merge pull request #42 from qorix-group/pawelrutkaq_fix_deps
infra: align toolchains usage, deps and enable QNX8 CI
2 parents 62cb1a9 + c7eee30 commit 5b7d963

File tree

6 files changed

+53
-354
lines changed

6 files changed

+53
-354
lines changed

.bazelrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@ common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry
99
common --registry=https://bcr.bazel.build
1010
common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
1111

12-
build:build_qnx8 --platforms=@score_toolchains_rust//platforms:aarch64-unknown-qnx8_0
12+
build:build_qnx8 --platforms=@score_bazel_platforms//:arm64-qnx8_0
13+
build:build_qnx8 --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
14+
build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0
15+
build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux
16+
build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
17+
build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
18+
19+
common --extra_toolchains=@gcc_toolchain//:host_gcc_12
20+
common --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux

.github/workflows/build_qnx8.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# *******************************************************************************
2+
# Copyright (c) 2025 Contributors to the Eclipse Foundation
3+
#
4+
# See the NOTICE file(s) distributed with this work for additional
5+
# information regarding copyright ownership.
6+
#
7+
# This program and the accompanying materials are made available under the
8+
# terms of the Apache License Version 2.0 which is available at
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# SPDX-License-Identifier: Apache-2.0
12+
# *******************************************************************************
13+
14+
name: QNX8 Build
15+
on:
16+
pull_request_target:
17+
types: [opened, reopened, synchronize]
18+
merge_group:
19+
types: [checks_requested]
20+
jobs:
21+
qnx-build:
22+
uses: eclipse-score/cicd-workflows/.github/workflows/qnx-build.yml@main
23+
permissions:
24+
contents: read
25+
pull-requests: read
26+
with:
27+
bazel-target: '//src/...'
28+
bazel-config: 'build_qnx8'
29+
credential-helper: 'scripts/internal/qnx_creds.py'
30+
environment-name: 'workflow-approval'
31+
secrets:
32+
score-qnx-license: ${{ secrets.SCORE_QNX_LICENSE }}
33+
score-qnx-user: ${{ secrets.SCORE_QNX_USER }}
34+
score-qnx-password: ${{ secrets.SCORE_QNX_PASSWORD }}

MODULE.bazel

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
2626
bazel_dep(name = "platforms", version = "1.0.0")
2727

2828
# S-CORE process rules
29-
bazel_dep(name = "score_bazel_platforms", version = "0.0.2")
29+
bazel_dep(name = "score_bazel_platforms", version = "0.0.3")
3030
bazel_dep(name = "score_docs_as_code", version = "2.0.2")
3131
bazel_dep(name = "score_tooling", version = "1.0.4")
3232
bazel_dep(name = "score_rust_policies", version = "0.0.3")
3333

34-
bazel_dep(name = "score_process", version = "1.3.1", dev_dependency = True)
35-
bazel_dep(name = "score_platform", version = "0.4.2", dev_dependency = True) # This is main score repo
34+
bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
35+
bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True) # This is main score repo
3636
bazel_dep(name = "score_virtualization", version = "0.0.1", dev_dependency = True)
3737

3838
# Toolchains and extensions
39-
bazel_dep(name = "score_toolchains_gcc", version = "0.4", dev_dependency = True)
40-
bazel_dep(name = "score_toolchains_qnx", version = "0.0.2", dev_dependency = True)
39+
bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = True)
40+
bazel_dep(name = "score_toolchains_qnx", version = "0.0.6", dev_dependency = True)
4141
bazel_dep(name = "rust_qnx8_toolchain", version = "1.2.0", dev_dependency = True)
4242
bazel_dep(name = "score_toolchains_rust", version = "0.1.1", dev_dependency = True)
4343

4444
# S-CORE crates
45-
bazel_dep(name = "score_crates")
45+
bazel_dep(name = "score_crates", version = "0.0.6")
4646

4747
# Overrides
4848
git_override(
@@ -53,7 +53,7 @@ git_override(
5353

5454
git_override(
5555
module_name = "score_toolchains_rust",
56-
commit = "6651945b4ba8e7c342d9740e9cb2d37842f56261",
56+
commit = "bcf8e5364f72cf136ec81960350a82e2b5c45449",
5757
remote = "https://github.com/eclipse-score/toolchains_rust.git",
5858
)
5959

@@ -63,14 +63,6 @@ git_override(
6363
remote = "https://github.com/qorix-group/score_virtualization.git",
6464
)
6565

66-
git_override(
67-
module_name = "score_crates",
68-
# TODO: 'commit' and 'remote' must be updated once required changes are merged.
69-
# https://github.com/eclipse-score/score-crates/pull/16
70-
commit = "f0bf4bdf98d8a8ad548256ab24dc08f9ba8f04aa",
71-
remote = "https://github.com/qorix-group/score-crates.git",
72-
)
73-
7466
archive_override(
7567
module_name = "rust_qnx8_toolchain",
7668
strip_prefix = "qnx8",
@@ -108,17 +100,3 @@ use_repo(python)
108100
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
109101
use_repo(toolchains_qnx, "toolchains_qnx_qcc")
110102
use_repo(toolchains_qnx, "toolchains_qnx_ifs")
111-
112-
# Registers the custom Rust toolchain wired to @qnx_rust
113-
register_toolchains(
114-
"@toolchains_qnx_qcc//:qcc_aarch64",
115-
"@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0",
116-
"@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux",
117-
dev_dependency = True,
118-
)
119-
120-
register_toolchains(
121-
"@toolchains_qnx_ifs//:ifs_x86_64",
122-
"@toolchains_qnx_ifs//:ifs_aarch64",
123-
dev_dependency = True,
124-
)

docs/baselibs_rust/containers_rust/requirements/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Requirements
1919
:id: doc__containers_rust_lib_requirements
2020
:status: draft
2121
:safety: ASIL_B
22+
:security: NO
2223
:realizes: wp__requirements_comp
2324
:tags: requirements, containers_rust_library
2425

docs/features/baselibs_rust/requirements/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Requirements
1919
:id: doc__baselibs_rust_requirements
2020
:status: draft
2121
:safety: ASIL_B
22+
:security: NO
2223
:realizes: wp__requirements_feat
2324

2425
.. feat_req:: Core Software Utilities

0 commit comments

Comments
 (0)