Skip to content

Commit

Permalink
Update versions (#249)
Browse files Browse the repository at this point in the history
Signed-off-by: Dennis Meister <dennis.meister@bosch.com>
  • Loading branch information
dennismeister93 authored Jun 27, 2024
1 parent a5fd487 commit 54500e4
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 21 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# 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
#
# This program and the accompanying materials are made available under the
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/check-licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: eclipse-velocitas/license-check
ref: v1.2.3
ref: v1.2
path: .github/actions/license-check

- name: Run License Checker
Expand All @@ -54,15 +54,17 @@ jobs:
- name: Setup Java JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 11.0.19

- name: Run dash
shell: bash
continue-on-error: true
run: |
wget -O dash.jar "https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/1.0.2/org.eclipse.dash.licenses-1.0.2.jar"
java -jar dash.jar clearlydefined.input -summary DEPENDENCIES
java -jar dash.jar clearlydefined.input -summary DEPENDENCIES > dash.out 2>&1 || true
echo -e "Dash output: \n\`\`\` " >> $GITHUB_STEP_SUMMARY
cat dash.out >> $GITHUB_STEP_SUMMARY
echo -e "\n\`\`\`"
- name: Upload dash input/output as artifacts
uses: actions/upload-artifact@v4
Expand All @@ -72,3 +74,4 @@ jobs:
path: |
clearlydefined.input
DEPENDENCIES
dash.out
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
git config --global --add safe.directory $( pwd )
- name: Run Linters
uses: pre-commit/action@v3.0.0
uses: pre-commit/action@v3.0.1

- name: Clone Release Documentation Action repository
uses: actions/checkout@v4
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/gen-desired-state.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ jobs:
sudo chmod +x /usr/bin/velocitas
velocitas init -v
- id: get_version
uses: battila7/get-version-action@v2
- name: Extract version from tag
id: get_version
run: |
VERSION=${GITHUB_REF_NAME#v}
echo Version: $VERSION
echo "version-without-v=$VERSION" >> $GITHUB_OUTPUT
- id: github-repository-name-case-adjusted
name: Prepare repository name in lower case for docker upload.
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,14 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- id: get_version
uses: battila7/get-version-action@v2
- name: Extract version from tag
id: get_version
run: |
VERSION=${GITHUB_REF_NAME#v}
echo Version: $VERSION
echo "version-without-v=$VERSION" >> $GITHUB_OUTPUT
- run: echo "Using VehicleApp version ${{ steps.get_version.outputs.version-without-v }} from tag"
- run: echo "Using VehicleApp version ${{ steps.get_version.outputs.version-without-v }} from tag"

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand Down
6 changes: 3 additions & 3 deletions .velocitas-lock.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"packages": {
"devenv-runtimes": "v4.0.1",
"devenv-github-workflows": "v6.0.3",
"devenv-runtimes": "v4.0.3",
"devenv-github-workflows": "v6.0.4",
"devenv-github-templates": "v1.0.5",
"devenv-devcontainer-setup": "v2.4.0"
"devenv-devcontainer-setup": "v2.4.4"
}
}
8 changes: 4 additions & 4 deletions .velocitas.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"packages": {
"devenv-runtimes": "v4.0.1",
"devenv-github-workflows": "v6.0.3",
"devenv-runtimes": "v4.0.3",
"devenv-github-workflows": "v6.0.4",
"devenv-github-templates": "v1.0.5",
"devenv-devcontainer-setup": "v2.4.0"
"devenv-devcontainer-setup": "v2.4.4"
},
"components": [
"runtime-local",
Expand All @@ -23,5 +23,5 @@
"githubRepoId": "eclipse-velocitas/vehicle-app-python-template",
"generatedModelPath": "./gen/vehicle_model"
},
"cliVersion": "v0.9.1"
"cliVersion": "v0.10.0"
}
7 changes: 3 additions & 4 deletions NOTICE-3RD-PARTY-CONTENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
|packaging|23.2|Apache 2.0<br/>BSD|
|paho-mqtt|1.6.1|OSI Approved|
|parameterized|0.9.0|Simplified BSD|
|pip|24.0|MIT|
|pip|23.0.1|MIT|
|pip-tools|7.3.0|BSD|
|platformdirs|3.11.0|MIT|
|pluggy|1.3.0|MIT|
Expand All @@ -48,7 +48,7 @@
|pytest-cov|4.1.0|MIT|
|pytest-ordering|0.6|MIT|
|PyYAML|6.0.1|MIT|
|setuptools|58.1.0|MIT|
|setuptools|65.5.1|MIT|
|tomli|2.0.1|MIT|
|types-mock|5.1.0.2|Apache 2.0|
|types-protobuf|4.24.0.2|Apache 2.0|
Expand All @@ -69,7 +69,6 @@
|actions/upload-artifact|v4|MIT License|
|aquasecurity/trivy-action|0.19.0|Apache License 2.0|
|ASzc/change-string-case-action|v6|ISC License|
|battila7/get-version-action|v2|MIT License|
|dawidd6/action-download-artifact|v3|MIT License|
|de-vri-es/setup-git-credentials|v2|BSD 2-Clause "Simplified" License|
|devcontainers/ci|v0.3|MIT License|
Expand All @@ -83,5 +82,5 @@
|mikepenz/action-junit-report|v4|Apache License 2.0|
|peaceiris/actions-gh-pages|v4|MIT License|
|peaceiris/actions-hugo|v3|MIT License|
|pre-commit/action|v3.0.0|MIT License|
|pre-commit/action|v3.0.1|MIT License|
|softprops/action-gh-release|v2|MIT License|

0 comments on commit 54500e4

Please sign in to comment.