diff --git a/.github/actions/pre-commit-action/action.yml b/.github/actions/pre-commit-action/action.yml deleted file mode 100644 index fd991354..00000000 --- a/.github/actions/pre-commit-action/action.yml +++ /dev/null @@ -1,35 +0,0 @@ -# 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 -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0. -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -name: pre-commit -description: run pre-commit -inputs: - extra_args: - description: Options to pass to pre-commit run - required: false - default: "--all-files" -runs: - using: composite - steps: - - run: python -m pip install pre-commit - shell: bash - - run: python -m pip freeze --local - shell: bash - - uses: actions/cache@v4 - with: - path: ~/.cache/pre-commit - key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }} - - run: pre-commit run --show-diff-on-failure --color=always ${{ inputs.extra_args }} - shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e4717d3..5ed29cea 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: ./.github/actions/pre-commit-action + uses: pre-commit/action@v3.0.0 - name: Clone Release Documentation Action repository uses: actions/checkout@v4 @@ -252,7 +252,7 @@ jobs: path: | results/Documentation/renderer/* -merge-test-results: + merge-test-results: runs-on: ubuntu-latest needs: run-integration-tests steps: diff --git a/.velocitas.json b/.velocitas.json index bfdf288c..efa1cbc0 100644 --- a/.velocitas.json +++ b/.velocitas.json @@ -6,7 +6,7 @@ }, { "name": "devenv-github-workflows", - "version": "v4.1.3" + "version": "v4.1.4" }, { "name": "devenv-github-templates", diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md index 59003577..c696d359 100644 --- a/NOTICE-3RD-PARTY-CONTENT.md +++ b/NOTICE-3RD-PARTY-CONTENT.md @@ -29,7 +29,7 @@ |nodeenv|1.8.0|BSD| |packaging|23.2|Apache 2.0
BSD| |parameterized|0.9.0|Simplified BSD| -|pip|23.3.2|MIT| +|pip|24.0|MIT| |pip-tools|7.3.0|BSD| |platformdirs|3.11.0|MIT| |pluggy|1.3.0|MIT| @@ -77,4 +77,5 @@ |mikepenz/action-junit-report|v4|Apache License 2.0| |peaceiris/actions-gh-pages|v3|MIT License| |peaceiris/actions-hugo|v2|MIT License| +|pre-commit/action|v3.0.0|MIT License| |softprops/action-gh-release|v1|MIT License|