Skip to content

Commit 9f6e81b

Browse files
committed
bazel: bump deps
1 parent 7119207 commit 9f6e81b

File tree

6 files changed

+76
-44
lines changed

6 files changed

+76
-44
lines changed

.bazelrc

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,58 @@
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+
# -------------------------------------------------------------------------------
15+
# Links to S-CORE Bazel registry and Bazel Central Registry
16+
# -------------------------------------------------------------------------------
17+
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
18+
common --registry=https://bcr.bazel.build
19+
common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
20+
21+
# -------------------------------------------------------------------------------
22+
# Default flags (all configurations)
23+
# -------------------------------------------------------------------------------
124
build --java_language_version=17
225
build --tool_java_language_version=17
326
build --java_runtime_version=remotejdk_17
427
build --tool_java_runtime_version=remotejdk_17
528

629
test --test_output=errors
730

8-
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
9-
common --registry=https://bcr.bazel.build
10-
common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
11-
1231
# Ferrocene must be common compiler for HOST. To ensure metadata compatibility for proc macro crates!
1332
build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
1433

34+
35+
# -------------------------------------------------------------------------------
36+
# Config dedicated to target platform CPU:arm64 and OS:QNX
37+
# -------------------------------------------------------------------------------
1538
build:arm64-qnx --config=_common
1639
build:arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix
1740
build:arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0-posix
1841
build:arm64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_nto_qnx800
1942

43+
# -------------------------------------------------------------------------------
44+
# Config dedicated to target platform CPU:x86_64 and OS:QNX
45+
# -------------------------------------------------------------------------------
2046
build:x86_64-qnx --config=_common
2147
build:x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
2248
build:x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0-posix
2349
build:x86_64-qnx --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_pc_nto_qnx800
2450

2551
# TODO arm64 when rust support is there
2652

53+
# -------------------------------------------------------------------------------
54+
# Config dedicated to host platform CPU:x86_64 and OS:Linux
55+
# -------------------------------------------------------------------------------
2756
build:x86_64-linux --config=_common
2857
build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
2958
build:x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix

.github/workflows/build_qnx8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pull-requests: read
2626
with:
2727
bazel-target: '//src/...'
28-
bazel-config: 'arm64-qnx8'
28+
bazel-config: 'arm64-qnx'
2929
credential-helper: 'scripts/internal/qnx_creds.py'
3030
environment-name: 'workflow-approval'
3131
secrets:
@@ -39,7 +39,7 @@ jobs:
3939
pull-requests: read
4040
with:
4141
bazel-target: '//src/...'
42-
bazel-config: 'x86_64-qnx8'
42+
bazel-config: 'x86_64-qnx'
4343
credential-helper: 'scripts/internal/qnx_creds.py'
4444
environment-name: 'workflow-approval'
4545
secrets:

MODULE.bazel

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,25 @@ bazel_dep(name = "platforms", version = "1.0.0")
3333

3434
# S-CORE process rules
3535
bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
36-
bazel_dep(name = "score_docs_as_code", version = "2.2.0")
36+
bazel_dep(name = "score_docs_as_code", version = "3.0.0")
3737
bazel_dep(name = "score_tooling", version = "1.1.0")
3838
bazel_dep(name = "score_rust_policies", version = "0.0.3")
3939

40-
bazel_dep(name = "score_process", version = "1.2.1", dev_dependency = True)
41-
bazel_dep(name = "score_platform", version = "0.4.2", dev_dependency = True) # This is main score repo
42-
bazel_dep(name = "score_virtualization", version = "0.0.1", dev_dependency = True)
40+
bazel_dep(name = "score_process", version = "1.4.3", dev_dependency = True)
41+
bazel_dep(name = "score_platform", version = "0.5.2", dev_dependency = True) # This is main score repo
42+
git_override(
43+
module_name = "score_platform",
44+
commit = "6ef2b8c740eb538d9b9b44fabd3dea5e0a888da6",
45+
remote = "https://github.com/qorix-group/score.git",
46+
)
4347

4448
# Toolchains and extensions
4549
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
4650
bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
4751

4852
# Others
49-
bazel_dep(name = "custom_qemu", version = "1.0.0", dev_dependency = True)
50-
51-
bazel_dep(name = "googletest", version = "1.14.0")
52-
5353
bazel_dep(name = "score_test_scenarios", version = "0.3.1", dev_dependency = True)
5454

55-
# Overrides
56-
git_override(
57-
module_name = "score_virtualization",
58-
commit = "99d3f153c43796b67a63e82aad1ede6a881aa6af",
59-
remote = "https://github.com/qorix-group/score_virtualization.git",
60-
)
61-
62-
archive_override(
63-
module_name = "custom_qemu",
64-
integrity = "sha256-3V2d+p7nP0tsbrVWOPYUSJogLNal43CIAHEto6Vjdfg=",
65-
strip_prefix = "third_party", # matches top-level dir in the tar
66-
urls = [
67-
"https://github.com/qorix-group/custom-qemu/releases/download/1.0.0/custom_qemu.tar.gz",
68-
],
69-
)
70-
7155
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
7256
gcc.toolchain(
7357
name = "score_gcc_x86_64_toolchain",
@@ -126,5 +110,22 @@ use_repo(python)
126110

127111
use_repo(pip, "pip_score_venv_test")
128112

113+
bazel_dep(name = "score_virtualization", version = "0.0.3", dev_dependency = True)
114+
git_override(
115+
module_name = "score_virtualization",
116+
commit = "99d3f153c43796b67a63e82aad1ede6a881aa6af",
117+
remote = "https://github.com/qorix-group/score_virtualization.git",
118+
)
119+
120+
bazel_dep(name = "custom_qemu", version = "1.0.0", dev_dependency = True)
121+
archive_override(
122+
module_name = "custom_qemu",
123+
integrity = "sha256-3V2d+p7nP0tsbrVWOPYUSJogLNal43CIAHEto6Vjdfg=",
124+
strip_prefix = "third_party", # matches top-level dir in the tar
125+
urls = [
126+
"https://github.com/qorix-group/custom-qemu/releases/download/1.0.0/custom_qemu.tar.gz",
127+
],
128+
)
129+
129130
# S-CORE crates
130131
bazel_dep(name = "score_crates", version = "0.0.7")

README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ Repository for **safe async runtime** called **kyron** for Rust
66
[![Nightly CIT (Bazel)](../../actions/workflows/component_integration_tests_bazel.yml/badge.svg)](../../actions/workflows/component_integration_tests_bazel.yml)
77
[![Kyron Examples](https://img.shields.io/badge/Kyron-examples-red?style=flat&link=https%3A%2F%2Fgithub.com%2Feclipse-score%kyron%2Ftree%2Fmain%2Fsrc%2Fkyron)](src/kyron/README.md)
88

9-
10-
119
## Feature status and roadmap
1210

1311
* [Async Runtime](src/kyron/doc/features.md)
@@ -17,19 +15,21 @@ Repository for **safe async runtime** called **kyron** for Rust
1715
This repository includes two GitHub Actions workflows for component integration testing:
1816

1917
### Component Integration Tests (Cargo-based)
20-
- **Schedule**: Runs nightly at 1:45 UTC
21-
- **Build System**: Uses Cargo for Rust components
22-
- **Testing**: Executes Python test suite with pytest
23-
- **Nightly Mode**: Runs tests 20 times with `--count 20 --repeat-scope session` for enhanced
18+
19+
* **Schedule**: Runs nightly at 1:45 UTC
20+
* **Build System**: Uses Cargo for Rust components
21+
* **Testing**: Executes Python test suite with pytest
22+
* **Nightly Mode**: Runs tests 20 times with `--count 20 --repeat-scope session` for enhanced
2423
reliability testing
25-
- **Triggers**: Push/PR to main/development branches, and scheduled nightly runs
24+
* **Triggers**: Push/PR to main/development branches, and scheduled nightly runs
2625

2726
### Component Integration Tests (Bazel-based)
28-
- **Schedule**: Runs nightly at 1:15 UTC
29-
- **Build System**: Uses Bazel for all components
30-
- **Testing**: Builds Rust test scenarios and runs Python component integration tests
31-
- **Nightly Mode**: Uses `cit_repeat` target for flake detection
32-
- **Triggers**: Push/PR to main/development branches, and scheduled nightly runs
27+
28+
* **Schedule**: Runs nightly at 1:15 UTC
29+
* **Build System**: Uses Bazel for all components
30+
* **Testing**: Builds Rust test scenarios and runs Python component integration tests
31+
* **Nightly Mode**: Uses `cit_repeat` target for flake detection
32+
* **Triggers**: Push/PR to main/development branches, and scheduled nightly runs
3333

3434
Monitor via the status badges above and the Actions tab
3535

@@ -40,6 +40,7 @@ Monitor via the status badges above and the Actions tab
4040
```bash
4141
sudo apt-get update
4242
sudo apt-get install -y curl build-essential protobuf-compiler libclang-dev git python3-dev python-is-python3 python3-venv
43+
sudo apt install libc++-dev libc++abi-dev libstdc++-dev g++
4344
```
4445

4546
### Rust installation
@@ -91,8 +92,8 @@ Please follow
9192
to get access to QNX8 and how to setup QNX8 for `S-CORE`. In above link You will also find an
9293
instructions how to replace SDP in case You need to use other one (ie HW specific).
9394

94-
9595
### Building
96+
9697
```bash
9798
./scripts/build_qnx8.sh BAZEL_TARGET (default is //src/...)
9899
```

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.85.0"
2+
channel = "1.90.0"

rustfmt.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# rust formatter rules.
22
# check configuration fields here: https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=
33

4+
# We need to support `cargo fmt` for crates.io
45
edition = "2021"
56
tab_spaces = 4
67
match_block_trailing_comma = true

0 commit comments

Comments
 (0)