Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
40bcb16
Fix cross build
BjoernAtBosch Mar 31, 2025
1ca18d7
Update license file
BjoernAtBosch Mar 31, 2025
e1ac623
wip
BjoernAtBosch Feb 25, 2025
6955448
wip
BjoernAtBosch Mar 10, 2025
6eea41a
wip
BjoernAtBosch Mar 12, 2025
6ed3bcc
wip
BjoernAtBosch Mar 19, 2025
23ee5ef
wip
BjoernAtBosch Mar 21, 2025
860ff09
wip
BjoernAtBosch Mar 25, 2025
a386c07
wip
BjoernAtBosch Mar 25, 2025
20a5a71
wip
BjoernAtBosch Mar 26, 2025
8c07a18
wip
BjoernAtBosch Mar 26, 2025
6e36878
try
BjoernAtBosch Mar 27, 2025
9666697
try
BjoernAtBosch Mar 27, 2025
f97f65c
try2
BjoernAtBosch Mar 27, 2025
ea426f6
try3
BjoernAtBosch Mar 27, 2025
b1a61e8
try4
BjoernAtBosch Mar 27, 2025
c3049f4
try 5
BjoernAtBosch Mar 27, 2025
5ed2f49
try6
BjoernAtBosch Mar 28, 2025
31e3cda
wip
BjoernAtBosch Apr 2, 2025
6f538c8
TestPackage working
BjoernAtBosch Apr 7, 2025
8b21aec
Some cleanup
BjoernAtBosch Apr 8, 2025
17a02c3
Add test_package.sh
BjoernAtBosch Apr 8, 2025
8ca6f84
update ci workflow
BjoernAtBosch Apr 8, 2025
4e00447
fix script call
BjoernAtBosch Apr 8, 2025
5e9550e
Use latest Conan
BjoernAtBosch Apr 9, 2025
ddc90ab
Add marker for transitive headers
BjoernAtBosch Apr 24, 2025
995eb14
Merge branch 'main' into bjoern_conan2
BjoernAtBosch Apr 24, 2025
a09b092
Try fix licensechecker
BjoernAtBosch Apr 24, 2025
34c3620
Update readme
BjoernAtBosch Apr 25, 2025
e190fe3
GH do your work
BjoernAtBosch Apr 25, 2025
f3904a0
Update NOTICE-3RD-PARTY-CONTENT.md
BjoernAtBosch Apr 25, 2025
347b4c2
Update Conan
BjoernAtBosch Apr 25, 2025
ff2e46c
Update packages
BjoernAtBosch Apr 25, 2025
5258e94
Update base image to v0.4 + cli to v0.13.2
BjoernAtBosch Apr 28, 2025
f115615
some cleanup
BjoernAtBosch Apr 28, 2025
48b98db
Fix some findings
BjoernAtBosch May 8, 2025
2948670
Update license file
BjoernAtBosch May 8, 2025
55c5268
Update readme and license checker
BjoernAtBosch May 9, 2025
3743c7c
Update license file
BjoernAtBosch May 9, 2025
8152629
Update workflows to v7.0.0
BjoernAtBosch May 13, 2025
3b8dd58
Update devcontainer-setup to v3.0.0
BjoernAtBosch May 14, 2025
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
12 changes: 12 additions & 0 deletions .conan/profiles/linux-aarch64
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[settings]
os=Linux
arch=armv8
compiler=gcc
compiler.version=11
compiler.cppstd=17
compiler.libcxx=libstdc++11

[buildenv]
CC=aarch64-linux-gnu-gcc-11
CXX=aarch64-linux-gnu-g++-11
LD=aarch64-linux-gnu-ld
12 changes: 12 additions & 0 deletions .conan/profiles/linux-x86_64
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=11
compiler.cppstd=17
compiler.libcxx=libstdc++11

[buildenv]
CC=x86_64-linux-gnu-gcc-11
CXX=x86_64-linux-gnu-g++-11
LD=x86_64-linux-gnu-ld
7 changes: 0 additions & 7 deletions .conan/profiles/linux_aarch64_debug

This file was deleted.

7 changes: 0 additions & 7 deletions .conan/profiles/linux_aarch64_release

This file was deleted.

7 changes: 0 additions & 7 deletions .conan/profiles/linux_x86_64_debug

This file was deleted.

7 changes: 0 additions & 7 deletions .conan/profiles/linux_x86_64_release

This file was deleted.

4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand All @@ -13,7 +13,7 @@
#
# SPDX-License-Identifier: Apache-2.0

FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4

ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE
ENV REINSTALL_CMAKE_VERSION_FROM_SOURCE="${REINSTALL_CMAKE_VERSION_FROM_SOURCE:-none}"
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/configure-codespaces.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/configure-proxies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/container-set.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/onCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
6 changes: 4 additions & 2 deletions .devcontainer/scripts/postStartCommand.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2024 Contributors to the Eclipse Foundation
# Copyright (c) 2024-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand All @@ -14,7 +14,9 @@
#
# SPDX-License-Identifier: Apache-2.0

.devcontainer/scripts/upgrade-cli.sh
if [[ -z "${VELOCITAS_OFFLINE}" ]]; then
.devcontainer/scripts/upgrade-cli.sh
fi

# Call user initialization hook if present
POST_START_USER_HOOK_PATH=.devcontainer/scripts/onPostStartUserHook.sh
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/reinstall-cmake.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/setup-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/setup-git.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/scripts/upgrade-cli.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-licenses.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: eclipse-velocitas/license-check
ref: v1.2
ref: v1.3
path: .github/actions/license-check

- name: Run License Checker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-updates.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2024 Contributors to the Eclipse Foundation
# Copyright (c) 2024-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down
21 changes: 11 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -29,16 +29,15 @@ on:
branches:
- main
jobs:
conan-package:
cpp-package:
runs-on: ubuntu-22.04
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
name: Check Conan package
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
name: Check C++ package
strategy:
matrix:
host: ["linux_x86_64"]
host: ["linux-x86_64"]
fail-fast: false


steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -52,14 +51,14 @@ jobs:
sudo apt-get update && sudo apt-get install -y ninja-build clang-format-14 clang-tidy-14 cppcheck
pip3 install -r requirements.txt

- name: Create conan package
- name: Test creating the C++ package
run: |
conan create --build=missing -pr:b ./.conan/profiles/linux_x86_64_release -pr:h ./.conan/profiles/${{ matrix.host }}_release . ci/testing
.scripts/test_package.sh ${{ matrix.host }}

build-and-publish:
runs-on: ubuntu-22.04
name: "Build, Test and Lint"
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4

steps:
- name: Checkout repository
Expand All @@ -84,7 +83,9 @@ jobs:
run: build/bin/sdk_utests

- name: Generate coverage report
run: cd build && gcovr -r ..
# If 'build' folder is a symlink, assigning pwd to ROOT_DIR makes this independent
# of the number of dirs covered by the symlink
run: ROOT_DIR=$(pwd) && cd build && gcovr -r $ROOT_DIR

- name: Code Coverage Summary Report
uses: irongut/CodeCoverageSummary@v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ensure-lifecycle.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is maintained by velocitas CLI, do not modify manually. Change settings in .velocitas.json
# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2023-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -29,7 +29,7 @@ on:
jobs:
check-sync:
runs-on: ubuntu-22.04
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.3
container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.4
name: Are files in sync?

steps:
Expand Down
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2024 Contributors to the Eclipse Foundation
# Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
Expand Down Expand Up @@ -49,16 +49,12 @@
*.pyc

# CMake
build
build*
CMakeUserPresets.json

# Mac files
.DS_Store

# Downloaded assets
Assets
.vscode/scripts/assets/
get_helm.sh

# conan licenses
licenses
conan_imports_manifest.txt
Expand Down
2 changes: 1 addition & 1 deletion .licensechecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ whitelist-file-path: ./whitelisted-licenses.txt
scan-dirs:
- path: .
cpp-conan-included-profile-files:
- "./.conan/profiles/linux_x86_64_release"
- "./.conan/profiles/linux-x86_64"
44 changes: 0 additions & 44 deletions .ort.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ repos:
"--suppress=uninitMemberVar",
"--suppress=unmatchedSuppression",
# suppress all warnings for generated code
"--suppress=*:build/*",
"--suppress=*:build*/*",
"--suppress=*:app/vehicle_model/*",
"--suppress=*:examples/vehicle_model/*",
]
Expand Down
6 changes: 3 additions & 3 deletions .scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#
# SPDX-License-Identifier: Apache-2.0

function get_valid_cross_compile_architecute() {
if [[ "$1" == "aarch64" || "$1" == "arm64" ]]; then
function get_valid_cross_compile_architecture() {
if [[ "$1" == "aarch64" || "$1" == "arm64" || "$1" == "armv8" ]]; then
HOST_ARCH="aarch64"
elif [[ "$1" == "x86_64" || "$1" == "amd64" ]]; then
HOST_ARCH="x86_64"
Expand All @@ -24,4 +24,4 @@ function get_valid_cross_compile_architecute() {

echo $HOST_ARCH
return 0
}
}
Loading