From 21467b126f92ad5dfe5bf376dd0629ef5b7b8d95 Mon Sep 17 00:00:00 2001 From: Dennis Meister Date: Thu, 27 Jun 2024 10:35:07 +0200 Subject: [PATCH] Update versions Signed-off-by: Dennis Meister --- .devcontainer/Dockerfile | 1 + .github/workflows/check-licenses.yml | 11 +++++++---- .github/workflows/ci.yml | 2 +- .github/workflows/gen-desired-state.yml | 8 ++++++-- .github/workflows/release.yml | 8 ++++++-- .velocitas-lock.json | 6 +++--- .velocitas.json | 8 ++++---- NOTICE-3RD-PARTY-CONTENT.md | 9 ++++----- build.py | 3 +-- install_deps.py | 3 +-- 10 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8bb5727..aa011a8 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 f218af9..c8dcbf8 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 f548c91..36cf598 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,4 +94,4 @@ jobs: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY - name: Run Linters - uses: pre-commit/action@v3.0.0 + uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/gen-desired-state.yml b/.github/workflows/gen-desired-state.yml index 01e0c7f..3d4dc6b 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 77eec97..363ea5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,8 +59,12 @@ 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" diff --git a/.velocitas-lock.json b/.velocitas-lock.json index b5f1eb5..31936e5 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 f823d36..1c6dfb2 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", @@ -25,5 +25,5 @@ "githubRepoId": "eclipse-velocitas/vehicle-app-cpp-template", "vehicleAppPort": -1 }, - "cliVersion": "v0.9.1" + "cliVersion": "v0.10.0" } diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index 286435c..6c8b929 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -13,7 +13,7 @@ |distlib|0.3.8|Python Software Foundation License| |distro|1.8.0|Apache 2.0| |fasteners|0.19|Apache 2.0| -|filelock|3.15.1|The Unlicense (Unlicense)| +|filelock|3.15.4|The Unlicense (Unlicense)| |gcovr|5.2|BSD| |identify|2.5.36|MIT| |idna|3.7|BSD| @@ -33,8 +33,8 @@ |requests|2.32.3|Apache 2.0| |six|1.16.0|MIT| |tqdm|4.66.4|MIT
Mozilla Public License 2.0 (MPL 2.0)| -|urllib3|1.26.18|MIT| -|virtualenv|20.26.2|MIT| +|urllib3|1.26.19|MIT| +|virtualenv|20.26.3|MIT| ## Workflows | Dependency | Version | License | |:-----------|:-------:|--------:| @@ -46,7 +46,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| @@ -60,5 +59,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| diff --git a/build.py b/build.py index 276cf8f..ec2ac4d 100644 --- a/build.py +++ b/build.py @@ -19,8 +19,7 @@ from pathlib import Path from typing import List -from shared_utils import get_valid_arch -from velocitas_lib import get_workspace_dir +from velocitas_lib import get_valid_arch, get_workspace_dir CMAKE_EXECUTABLE = "cmake" CONAN_EXECUTABLE = "conan" diff --git a/install_deps.py b/install_deps.py index a0e415c..28b00e5 100644 --- a/install_deps.py +++ b/install_deps.py @@ -22,8 +22,7 @@ from argparse import ArgumentParser from pathlib import Path -from shared_utils import get_valid_arch -from velocitas_lib import get_workspace_dir +from velocitas_lib import get_valid_arch, get_workspace_dir def safe_get_workspace_dir() -> str: