Skip to content

Commit

Permalink
Integrate SDK 3.0.1, baseimage 0.1.2, workflow 2.0.7, setup 1 (#51)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
BjoernAtBosch authored Jun 5, 2023
1 parent 991f805 commit 56ffb6b
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ensure-lifecycle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
56 changes: 28 additions & 28 deletions .ort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .velocitas.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
},
{
"name": "devenv-github-workflows",
"version": "v2.0.6"
"version": "v2.0.7"
},
{
"name": "devenv-github-templates",
"version": "v1.0.1"
},
{
"name": "devenv-devcontainer-setup",
"version": "v1.1.7"
"version": "v1.1.8"
}
],
"variables": {
Expand Down
4 changes: 2 additions & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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|
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion sdk

0 comments on commit 56ffb6b

Please sign in to comment.