Skip to content

Commit

Permalink
Upgrade project config (#98)
Browse files Browse the repository at this point in the history
  • Loading branch information
doosuu authored May 8, 2024
1 parent 0a19243 commit 23d3455
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 28 deletions.
8 changes: 8 additions & 0 deletions .velocitas-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"packages": {
"devenv-runtimes": "v3.1.0",
"devenv-github-workflows": "v6.0.0",
"devenv-github-templates": "v1.0.4",
"devenv-devcontainer-setup": "v2.1.0"
}
}
36 changes: 18 additions & 18 deletions .velocitas.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"packages": [
{
"name": "devenv-runtimes",
"version": "v3.0.0"
},
{
"name": "devenv-github-workflows",
"version": "v6.0.0"
},
{
"name": "devenv-github-templates",
"version": "v1.0.4"
},
{
"name": "devenv-devcontainer-setup",
"version": "v2.0.0"
}
"packages": {
"devenv-runtimes": "v3.1.0",
"devenv-github-workflows": "v6.0.0",
"devenv-github-templates": "v1.0.4",
"devenv-devcontainer-setup": "v2.1.0"
},
"components": [
"runtime-local",
"runtime-kanto",
"deployment-kanto",
"pantaris-integration",
"github-workflows",
"github-templates",
"devcontainer-setup",
"vehicle-signal-interface",
"grpc-interface-support",
"sdk-installer"
],
"variables": {
"language": "cpp",
Expand All @@ -24,5 +24,5 @@
"githubRepoId": "eclipse-velocitas/vehicle-app-cpp-template",
"vehicleAppPort": -1
},
"cliVersion": "v0.7.0"
"cliVersion": "v0.9.0"
}
10 changes: 5 additions & 5 deletions NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
|distlib|0.3.8|Python Software Foundation License|
|distro|1.8.0|Apache 2.0|
|fasteners|0.19|Apache 2.0|
|filelock|3.13.4|The Unlicense (Unlicense)|
|filelock|3.14.0|The Unlicense (Unlicense)|
|gcovr|5.2|BSD|
|identify|2.5.36|MIT|
|idna|3.7|BSD|
|Jinja2|3.1.3|New BSD|
|jinja2|3.1.4|BSD|
|lxml|5.2.1|New BSD|
|MarkupSafe|2.1.5|New BSD|
|node-semver|0.6.1|MIT|
Expand All @@ -26,16 +26,16 @@
|platformdirs|4.2.1|MIT|
|pluginbase|1.0.1|BSD|
|pre-commit|3.5.0|MIT|
|pygments|2.17.2|Simplified BSD|
|pygments|2.18.0|Simplified BSD|
|PyJWT|2.8.0|MIT|
|python-dateutil|2.9.0.post0|Apache 2.0<br/>BSD|
|PyYAML|6.0.1|MIT|
|requests|2.31.0|Apache 2.0|
|setuptools|58.1.0|MIT|
|six|1.16.0|MIT|
|tqdm|4.66.2|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
|tqdm|4.66.4|MIT<br/>Mozilla Public License 2.0 (MPL 2.0)|
|urllib3|1.26.18|MIT|
|virtualenv|20.26.0|MIT|
|virtualenv|20.26.1|MIT|
## Workflows
| Dependency | Version | License |
|:-----------|:-------:|--------:|
Expand Down
5 changes: 0 additions & 5 deletions app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ COPY . /workspace

ENV CONAN_USER_HOME /home/vscode/

# FIXME: For build tooling we only need "devenv-devcontainer-setup", we should be able to
# filter this without manual jq intervention...
RUN mv /workspace/.velocitas.json /workspace/.velocitas_org.json && \
cat /workspace/.velocitas_org.json | jq 'del(.packages[] | select(.name != "devenv-devcontainer-setup"))' > /workspace/.velocitas.json

WORKDIR /workspace

RUN velocitas init -f -v && \
Expand Down

0 comments on commit 23d3455

Please sign in to comment.