Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ common --registry=https://bcr.bazel.build
common --@score_logging//score/mw/log/flags:KRemote_Logging=False

build --@score_baselibs//score/json:base_library=nlohmann
build --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
build --credential_helper="*.qnx.com=%workspace%/.github/tools/qnx_credential_helper.py"

# -------------------------------------------------------------------------------
Expand All @@ -35,20 +36,28 @@ build:time_shared --host_platform=@score_bazel_platforms//:x86_64-linux
# -------------------------------------------------------------------------------
build:time-x86_64-linux --config=time_shared
build:time-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
build:time-x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
build:time-x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0

# -------------------------------------------------------------------------------
# Config dedicated to host platform CPU:arm64 and OS:Linux
# -------------------------------------------------------------------------------
build:time-arm64-linux --config=time_shared
build:time-arm64-linux --platforms=@score_bazel_platforms//:aarch64-linux-gcc_12.2.0-posix
build:time-arm64-linux --extra_toolchains=@score_gcc_aarch64_toolchain//:aarch64-linux-gcc_12.2.0

# -------------------------------------------------------------------------------
# Config dedicated to target platform CPU:x86_64 and OS:QNX
# -------------------------------------------------------------------------------
build:time-x86_64-qnx --config=time_shared
build:time-x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx-sdp_8.0.0-posix
build:time-x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0-posix
build:time-x86_64-qnx --extra_toolchains=@score_qcc_x86_64_toolchain//:x86_64-qnx-sdp_8.0.0

# -------------------------------------------------------------------------------
# Config dedicated to target platform CPU:arm64 and OS:QNX
# -------------------------------------------------------------------------------
build:time-arm64-qnx --config=time_shared
build:time-arm64-qnx --platforms=@score_bazel_platforms//:aarch64-qnx-sdp_8.0.0-posix
build:time-arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0-posix
build:time-arm64-qnx --extra_toolchains=@score_qcc_aarch64_toolchain//:aarch64-qnx-sdp_8.0.0

# -------------------------------------------------------------------------------
# Import local user workspace file, if exists
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
name: Bazel Build (Linux)
name: Bazel Build

on:
pull_request:
types: [opened, reopened, synchronize]
push:
branches:
- main
merge_group:
types: [checks_requested]
workflow_call:
jobs:
linux-build:
build:
runs-on: ubuntu-latest
strategy:
matrix:
config: [time-x86_64-linux, time-arm64-linux]
steps:
- name: Checkout Repository
uses: actions/checkout@v6
- name: Checkout code
uses: actions/checkout@v4.2.2

- name: Setup Bazel
uses: bazel-contrib/setup-bazel@0.18.0
with:
bazelisk-cache: true
disk-cache: ${{ github.job }}
disk-cache: ${{ github.workflow }}-${{ matrix.config }}
repository-cache: true
cache-save: ${{ github.event_name == 'push' }}
- name: Bazel Build

- name: Build with Bazel
run: |
bazel build --config time-x86_64-linux -- //score/... //examples/...
bazel build --lockfile_mode=error --config ${{ matrix.config }} //score/... //examples/...
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

# Bazel
bazel-*
MODULE.bazel.lock
user.bazelrc

# Ruff
Expand Down
26 changes: 15 additions & 11 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module(

## Configure the C++ toolchain

bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2", dev_dependency = True)
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.4", dev_dependency = True)

gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
gcc.toolchain(
Expand All @@ -37,15 +37,15 @@ gcc.toolchain(
)
gcc.toolchain(
name = "score_qcc_x86_64_toolchain",
sdp_version = "8.0.0",
sdp_version = "8.0.4",
target_cpu = "x86_64",
target_os = "qnx",
use_default_package = True,
version = "12.2.0",
)
gcc.toolchain(
name = "score_qcc_aarch64_toolchain",
sdp_version = "8.0.0",
sdp_version = "8.0.4",
target_cpu = "aarch64",
target_os = "qnx",
use_default_package = True,
Expand All @@ -65,19 +65,23 @@ use_repo(

bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "score_bazel_platforms", version = "0.1.2")
bazel_dep(name = "score_logging", version = "0.2.0")
bazel_dep(name = "score_logging", version = "0.2.1")

### Modules that are used internally within the repository but not exposed as part of the public API

bazel_dep(name = "score_docs_as_code", version = "4.3.0", dev_dependency = True)
bazel_dep(name = "score_process", version = "1.5.4", dev_dependency = True)
bazel_dep(name = "score_docs_as_code", version = "4.5.0")

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

-> 4.6.0?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

no, not for now until we get new version


bazel_dep(name = "score_process", version = "1.6.0", dev_dependency = True)
bazel_dep(name = "score_tooling", version = "1.2.0", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)
bazel_dep(name = "aspect_rules_lint", version = "2.3.0", dev_dependency = True)
bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)
bazel_dep(name = "score_baselibs", version = "0.2.7", dev_dependency = True)
bazel_dep(name = "score_lifecycle_health", version = "0.2.0", dev_dependency = True)

bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
bazel_dep(name = "google_benchmark", version = "1.9.5")

bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)

bazel_dep(name = "score_baselibs", version = "0.2.7")

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

-> 0.2.8?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

no, has to be aligned to 0.7 score release

bazel_dep(name = "score_lifecycle_health", version = "0.2.0")

# grpc-java@1.66.0 has a BCR bug (extension no longer generates
# com_envoyproxy_protoc_gen_validate). Pulled transitively via
Expand Down
Loading
Loading