Conan2 migration (C++ parts) (#107)

Author: BjoernAtBosch

.devcontainer/Dockerfile

@@ -12,7 +12,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.3
+FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.4
 
 ENV DOCKER_BUILDKIT=1
 

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
   unit-test:
     name: "Run unit tests"
     runs-on: ubuntu-22.04
-    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.3
+    container: ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.4
     strategy:
       matrix:
         component:
@@ -124,8 +124,17 @@ jobs:
       fail-fast: false
 
     steps:
+      - name: Checkout C++ template repository
+        uses: actions/checkout@v4
+        if: ${{ matrix.language == 'cpp' }}
+        with:
+          repository: eclipse-velocitas/vehicle-app-${{ matrix.language }}-template
+          ref: conan2-prerelease
+          fetch-depth: 0
+
       - name: Checkout template repository
         uses: actions/checkout@v4
+        if: ${{ matrix.language != 'cpp' }}
         with:
           repository: eclipse-velocitas/vehicle-app-${{ matrix.language }}-template
           fetch-depth: 0

.gitignore

@@ -2,3 +2,4 @@
 __pycache__
 *.egg-info
 build/**
+CMakeUserPresets.json

.pre-commit-config.yaml

@@ -16,7 +16,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

README.md

@@ -2,6 +2,14 @@
 
 Repo for Devcontainer Configuration and vehicle model generation on container startup.
 
+> [!IMPORTANT]
+> We sucessfully migrated our C++ repositories to use version 2 of the [Conan package manager](https://conan.io/).
+> Unfortunately, those changes are not backwards compatible. So, please be aware that versions >= 3.0.0 of this repository
+> are compatible with recent versions of the [C++ SDK](https://github.com/eclipse-velocitas/vehicle-app-cpp-sdk) (>= v0.7.0)
+> and [C++ App Template](https://github.com/eclipse-velocitas/vehicle-app-cpp-template), only.
+>
+> This is not relevant for the Python related template and SDK repositories.
+
 ## Components in this package
 
 * [Basic Setup](./setup/README.md)

build-system/cpp-cmake-conan/requirements.txt

@@ -1 +1,2 @@
-velocitas-lib==0.0.12
+shell-source>=3.0.0,<4
+velocitas-lib==0.0.13

build-system/cpp-cmake-conan/src/.conan/profiles/linux-aarch64

@@ -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

build-system/cpp-cmake-conan/src/.conan/profiles/linux-x86_64

@@ -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