From 4fdf5fc73f288921ed3e7f71bd70ed53829dfd84 Mon Sep 17 00:00:00 2001 From: konsti Date: Thu, 19 Sep 2024 13:32:08 +0200 Subject: [PATCH] Use a single lint task in CI (#7540) --- .github/workflows/ci.yml | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75e6d8f26568..2f27c1687b95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,9 +44,9 @@ jobs: - "docs/reference/cli.md" - "docs/reference/settings.md" - "uv.schema.json" - cargo-fmt: + lint: timeout-minutes: 10 - name: "cargo fmt" + name: "lint" runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -58,6 +58,9 @@ jobs: - name: "Install Rustfmt" run: rustup component add rustfmt + - name: "Install uv" + uses: astral-sh/setup-uv@v3 + - name: "rustfmt" run: cargo fmt --all --check @@ -69,27 +72,13 @@ jobs: - name: "README check" run: python scripts/transform_readme.py --target pypi - python-lint: - timeout-minutes: 10 - name: "Python lint" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: 3.12 - - - name: "Install uv" - run: curl -LsSf https://astral.sh/uv/install.sh | sh - - - name: "Format" + - name: "Python format" run: uvx ruff format --diff . - - name: "Lint" + - name: "Python lint" run: uvx ruff check . - - name: "Type check" + - name: "Python type check" run: uvx mypy cargo-clippy: @@ -186,6 +175,7 @@ jobs: - name: "Install required Python versions" run: | + # astral-sh/setup-uv sets `UV_CACHE_DIR` which disrupts the help message check curl -LsSf https://astral.sh/uv/install.sh | sh uv python install @@ -226,6 +216,7 @@ jobs: - name: "Install required Python versions" run: | + # astral-sh/setup-uv sets `UV_CACHE_DIR` which disrupts the help message check curl -LsSf https://astral.sh/uv/install.sh | sh uv python install