diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8b890c9a..de6d03ab 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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 diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml index f218af9e..c8dcbf81 100644 --- a/.github/workflows/check-licenses.yml +++ b/.github/workflows/check-licenses.yml @@ -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 @@ -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 @@ -72,3 +74,4 @@ jobs: path: | clearlydefined.input DEPENDENCIES + dash.out diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3048de6f..f13c1d02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/gen-desired-state.yml b/.github/workflows/gen-desired-state.yml index 83999f18..86b1fba3 100644 --- a/.github/workflows/gen-desired-state.yml +++ b/.github/workflows/gen-desired-state.yml @@ -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. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb728821..6378c169 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/.velocitas-lock.json b/.velocitas-lock.json index b5f1eb5a..31936e5b 100644 --- a/.velocitas-lock.json +++ b/.velocitas-lock.json @@ -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" } } diff --git a/.velocitas.json b/.velocitas.json index 25464468..76a2ce08 100644 --- a/.velocitas.json +++ b/.velocitas.json @@ -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", @@ -23,5 +23,5 @@ "githubRepoId": "eclipse-velocitas/vehicle-app-python-template", "generatedModelPath": "./gen/vehicle_model" }, - "cliVersion": "v0.9.1" + "cliVersion": "v0.10.0" } diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index 3bf1cb4a..6ef84a3b 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -36,7 +36,7 @@ |packaging|23.2|Apache 2.0
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| @@ -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| @@ -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| @@ -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|