ci: Remove cmake-format linter

This commit is contained in:
Nick Bolton
2024-10-15 13:15:59 +01:00
parent 28c8aae9af
commit 2b930a7b03
7 changed files with 9 additions and 131 deletions

View File

@ -1,5 +1,5 @@
name: "Lint clang"
description: "Clang Ling Sources"
description: "Lint with Clang formatter"
runs:
using: "composite"
@ -14,8 +14,8 @@ runs:
source .venv/bin/activate
pip install pyyaml clang_format
- name: Linting with CMake formatter
- name: Linting with Clang formatter
uses: ./.github/actions/lint-error
with:
format-command: ./scripts/lint_clang.py -f
format-tool: "cmake-format"
format-tool: "clang-format"

View File

@ -1,21 +0,0 @@
name: "Lint cmake"
description: "Lints cmake file"
runs:
using: "composite"
steps:
- name: Setup Python venv
uses: ./.github/actions/init-python
- name: Install dependencies
shell: bash
run: |
source .venv/bin/activate
pip install pyyaml cmake_format
- name: Linting with CMake formatter
uses: ./.github/actions/lint-error
with:
format-command: ./scripts/lint_cmake.py -f
format-tool: "cmake-format"

View File

@ -31,7 +31,7 @@ env:
jobs:
pr-comment-flags:
runs-on: ubuntu-latest
needs: [lint-cmake, lint-clang]
needs: lint-clang
if: ${{ github.event_name == 'pull_request' }}
outputs:
@ -79,17 +79,6 @@ jobs:
- name: Test summary
uses: ./.github/actions/test-summary
lint-cmake:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Lint Cmake
uses: ./.github/actions/lint-cmake
lint-clang:
runs-on: ubuntu-latest
timeout-minutes: 5
@ -102,7 +91,7 @@ jobs:
uses: ./.github/actions/lint-clang
analyse-valgrind:
needs: [lint-cmake, lint-clang]
needs: lint-clang
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/workflows/valgrind-analysis.yml
@ -114,7 +103,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
windows:
needs: [lint-cmake, lint-clang]
needs: lint-clang
name: ${{ matrix.target.name }}
runs-on: ${{ matrix.target.runs-on }}
container: ${{ matrix.target.container }}
@ -202,7 +191,7 @@ jobs:
path: ${{ env.PACKAGE_PATH }}
macos:
needs: [lint-cmake, lint-clang]
needs: lint-clang
name: ${{ matrix.target.name }}
runs-on: ${{ matrix.target.os }}
timeout-minutes: ${{ matrix.target.timeout }}
@ -283,7 +272,7 @@ jobs:
path: ${{ env.PACKAGE_PATH }}
linux-matrix:
needs: [lint-cmake, lint-clang]
needs: lint-clang
runs-on: ubuntu-latest
outputs:
@ -361,7 +350,7 @@ jobs:
# Technically, "unix" is a misnomer, but we use it here to mean "Unix-like BSD-derived".
unix:
needs: [lint-cmake, lint-clang]
needs: lint-clang
name: unix-${{ matrix.distro.name }}
runs-on: ${{ vars.CI_UNIX_RUNNER || 'ubuntu-24.04' }}
timeout-minutes: 20