diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1f2201b3514e..1b02ca9bbd73f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,3 +63,34 @@ jobs: run: ./util/prep-bazel-airgapped-build.sh - name: Build in the airgapped environment run: ./ci/scripts/test-airgapped-build.sh + + verible-lint: + name: Verible lint + runs-on: ubuntu-24.04 + needs: quick_lint + env: + verible_config: hw/lint/tools/veriblelint/lowrisc-styleguide.rules.verible_lint + verible_version: v0.0-3430-g060bde0f + steps: + - uses: actions/checkout@v4 + - name: Prepare Verible config + run: | + echo "Concatenating Verible waivers" + find . -type f -name '*.vbl' -exec cat {} \; >> verible_waiver + + echo "::group::Verible config" + cat "$verible_config" + echo "::endgroup::" + + echo "::group::Verible waiver" + cat "verible_waiver" + echo "::endgroup::" + - name: Run Verible linter action + uses: chipsalliance/verible-linter-action@v2.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + verible_version: ${{ env.verible_version }} + reviewdog_reporter: 'github-pr-check' + suggest_fixes: 'false' + config_file: ${{ env.verible_config }} + extra_args: "--waiver_files=verible_waiver" diff --git a/.github/workflows/pr_lint.yml b/.github/workflows/pr_lint.yml deleted file mode 100644 index c741a38dea235..0000000000000 --- a/.github/workflows/pr_lint.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright lowRISC contributors (OpenTitan project). -# Licensed under the Apache License, Version 2.0, see LICENSE for details. -# SPDX-License-Identifier: Apache-2.0 - -# GitHub Action to run Verible linting on pull requests and add review comments. -# -# See https://github.com/chipsalliance/verible-linter-action. - -name: pr-lint - -on: - pull_request: - -jobs: - verible-lint: - runs-on: ubuntu-latest - env: - verible_config: hw/lint/tools/veriblelint/lowrisc-styleguide.rules.verible_lint - steps: - - uses: actions/checkout@v4 - - name: Prepare Verible config - run: | - echo "Concatenating Verible waivers" - find . -type f -name '*.vbl' -exec cat {} \; >> verible_waiver - - echo "::group::Verible config" - cat "$verible_config" - echo "::endgroup::" - - echo "::group::Verible waiver" - cat "verible_waiver" - echo "::endgroup::" - - name: Run Verible linter action - uses: chipsalliance/verible-linter-action@v2.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - verible_version: "v0.0-3430-g060bde0f" - reviewdog_reporter: 'github-pr-check' - suggest_fixes: 'false' - config_file: ${{ env.verible_config }} - extra_args: "--waiver_files=verible_waiver"