From 56ffb6b846cb6d6bba1b94516ab8e1370cfc3111 Mon Sep 17 00:00:00 2001 From: BjoernAtBosch Date: Mon, 5 Jun 2023 09:05:28 +0200 Subject: [PATCH] Integrate SDK 3.0.1, baseimage 0.1.2, workflow 2.0.7, setup 1 (#51) * Try with optimized deps from sdk * Adapt NOTICE.md * Update sdk and sdk container to v0.3.1 * Update workflows and base image * Update c-ares in .ort.yml --- .devcontainer/Dockerfile | 2 +- .github/workflows/build-docker-image.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/ensure-lifecycle.yml | 2 +- .ort.yml | 56 ++++++++++++------------ .velocitas.json | 4 +- NOTICE.md | 4 +- app/Dockerfile | 2 +- sdk | 2 +- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8d4019b..18a9808 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -12,7 +12,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.1 +FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE ENV REINSTALL_CMAKE_VERSION_FROM_SOURCE="${REINSTALL_CMAKE_VERSION_FROM_SOURCE:-none}" diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index ef2b133..07effa7 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -38,7 +38,7 @@ jobs: build-image: name: "Building image (${{ matrix.component.name }})" runs-on: ubuntu-latest - container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.1 + container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2 strategy: matrix: component: ${{ fromJson(inputs.deployment-matrix-str) }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e8f176..b53cee9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ on: jobs: build-and-publish: runs-on: ubuntu-22.04 - container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.1 + container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2 name: "Build, Test and Lint" steps: - name: Checkout repository diff --git a/.github/workflows/ensure-lifecycle.yml b/.github/workflows/ensure-lifecycle.yml index 995833f..8d31b62 100644 --- a/.github/workflows/ensure-lifecycle.yml +++ b/.github/workflows/ensure-lifecycle.yml @@ -27,7 +27,7 @@ on: jobs: check-sync: runs-on: ubuntu-22.04 - container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.1 + container: ghcr.io/eclipse-velocitas/devcontainer-base-images/cpp:v0.1.2 name: Are files in sync? steps: diff --git a/.ort.yml b/.ort.yml index 6c8159f..4cf265a 100644 --- a/.ort.yml +++ b/.ort.yml @@ -14,31 +14,31 @@ curations: packages: - - id: "PyPI::identify:2.5.24" - curations: - comment: "Proper license is defined in package repository https://pypi.org/project/identify/" - concluded_license: "MIT" - - id: "Conan::c-ares:1.19.0" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/c-ares" - concluded_license: "MIT" - - id: "Conan::cpr:1.9.3" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/cpr" - concluded_license: "MIT" - - id: "Conan::googleapis:cci.20221108" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/googleapis?version=cci.20221108" - concluded_license: "Apache-2.0" - - id: "Conan::libcurl:7.87.0" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/libcurl?version=7.87.0" - concluded_license: "curl" - - id: "Conan::openssl:1.1.1t" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/openssl?version=1.1.1t" - concluded_license: "OpenSSL" - - id: "Conan::paho-mqtt-c:1.3.9" - curations: - comment: "Proper license is defined in package repository https://conan.io/center/paho-mqtt-c?version=1.3.9" - concluded_license: "EPL-2.0" + - id: "PyPI::identify:2.5.24" + curations: + comment: "Proper license is defined in package repository https://pypi.org/project/identify/" + concluded_license: "MIT" + - id: "Conan::c-ares:1.18.1" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/c-ares" + concluded_license: "MIT" + - id: "Conan::cpr:1.9.3" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/cpr" + concluded_license: "MIT" + - id: "Conan::googleapis:cci.20221108" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/googleapis?version=cci.20221108" + concluded_license: "Apache-2.0" + - id: "Conan::libcurl:7.87.0" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/libcurl?version=7.87.0" + concluded_license: "curl" + - id: "Conan::openssl:1.1.1t" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/openssl?version=1.1.1t" + concluded_license: "OpenSSL" + - id: "Conan::paho-mqtt-c:1.3.9" + curations: + comment: "Proper license is defined in package repository https://conan.io/center/paho-mqtt-c?version=1.3.9" + concluded_license: "EPL-2.0" diff --git a/.velocitas.json b/.velocitas.json index 805c03d..098b994 100644 --- a/.velocitas.json +++ b/.velocitas.json @@ -6,7 +6,7 @@ }, { "name": "devenv-github-workflows", - "version": "v2.0.6" + "version": "v2.0.7" }, { "name": "devenv-github-templates", @@ -14,7 +14,7 @@ }, { "name": "devenv-devcontainer-setup", - "version": "v1.1.7" + "version": "v1.1.8" } ], "variables": { diff --git a/NOTICE.md b/NOTICE.md index f86183c..1a1070c 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -51,7 +51,7 @@ they are given here (manually added) for time being: | Dependency | Version | License | |:-----------|:-------:|--------:| |abseil|20220623.0|Apache 2.0| -|c-ares|1.19.0|c-ares (MIT-style)| +|c-ares|1.18.1|c-ares (MIT-style)| |cpr|1.9.3|MIT| |fmt|9.1.0|MIT| |googleapis|cci.20221108|Apache 2.0| @@ -63,5 +63,5 @@ they are given here (manually added) for time being: |paho-mqtt-c|1.3.9|EPL 2.0 AND EDL 1.0| |paho-mqtt-cpp|1.2.0|EPL 1.0 AND EDL 1.0| |protobuf|3.21.9|Google License| -|re2|20230301|BSD-3-Clause| +|re2|20220601|BSD-3-Clause| |zlib|1.2.13|zlib/libpng license| diff --git a/app/Dockerfile b/app/Dockerfile index cd23dbd..af2bea8 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -14,7 +14,7 @@ # syntax = docker/dockerfile:1.2 -FROM ghcr.io/eclipse-velocitas/vehicle-app-cpp-sdk:v0.3.0 as builder +FROM ghcr.io/eclipse-velocitas/vehicle-app-cpp-sdk:v0.3.1 as builder RUN apk update && \ apk add ninja && \ diff --git a/sdk b/sdk index 993bdfb..33297ef 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 993bdfbef978c4acf265b8208cda98ae46061010 +Subproject commit 33297efd8df885232986ce8acf4882e4edee1918