mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-28 18:53:25 +00:00
Reduce duplicated logic between the macOS and Windows CI jobs (#20958)
This commit is contained in:
parent
09306a1d69
commit
44d9063058
1 changed files with 9 additions and 35 deletions
44
.github/workflows/ci.yaml
vendored
44
.github/workflows/ci.yaml
vendored
|
|
@ -334,9 +334,14 @@ jobs:
|
||||||
- name: "Run tests"
|
- name: "Run tests"
|
||||||
run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest
|
run: cargo insta test --release --all-features --unreferenced reject --test-runner nextest
|
||||||
|
|
||||||
cargo-test-windows:
|
cargo-test-other:
|
||||||
name: "cargo test (windows)"
|
strategy:
|
||||||
runs-on: ${{ github.repository == 'astral-sh/ruff' && 'depot-windows-2022-16' || 'windows-latest' }}
|
matrix:
|
||||||
|
platform:
|
||||||
|
- ${{ github.repository == 'astral-sh/ruff' && 'depot-windows-2022-16' || 'windows-latest' }}
|
||||||
|
- macos-latest
|
||||||
|
name: "cargo test (${{ matrix.platform }})"
|
||||||
|
runs-on: ${{ matrix.platform }}
|
||||||
needs: determine_changes
|
needs: determine_changes
|
||||||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
|
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
|
||||||
timeout-minutes: 20
|
timeout-minutes: 20
|
||||||
|
|
@ -355,37 +360,6 @@ jobs:
|
||||||
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
|
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
|
||||||
with:
|
with:
|
||||||
enable-cache: "true"
|
enable-cache: "true"
|
||||||
- name: "Run tests"
|
|
||||||
env:
|
|
||||||
# Workaround for <https://github.com/nextest-rs/nextest/issues/1493>.
|
|
||||||
RUSTUP_WINDOWS_PATH_ADD_BIN: 1
|
|
||||||
run: |
|
|
||||||
cargo nextest run --all-features --profile ci
|
|
||||||
cargo test --all-features --doc
|
|
||||||
|
|
||||||
cargo-test-macos:
|
|
||||||
name: "cargo test (macos)"
|
|
||||||
runs-on: macos-latest
|
|
||||||
needs: determine_changes
|
|
||||||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main') }}
|
|
||||||
timeout-minutes: 20
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
|
||||||
with:
|
|
||||||
persist-credentials: false
|
|
||||||
- uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
|
|
||||||
- name: "Install Rust toolchain"
|
|
||||||
run: rustup show
|
|
||||||
- name: "Install mold"
|
|
||||||
uses: rui314/setup-mold@725a8794d15fc7563f59595bd9556495c0564878 # v1
|
|
||||||
- name: "Install cargo nextest"
|
|
||||||
uses: taiki-e/install-action@522492a8c115f1b6d4d318581f09638e9442547b # v2.62.21
|
|
||||||
with:
|
|
||||||
tool: cargo-nextest
|
|
||||||
- name: "Install uv"
|
|
||||||
uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
|
|
||||||
with:
|
|
||||||
enable-cache: "true"
|
|
||||||
- name: "Run tests"
|
- name: "Run tests"
|
||||||
run: |
|
run: |
|
||||||
cargo nextest run --all-features --profile ci
|
cargo nextest run --all-features --profile ci
|
||||||
|
|
@ -675,7 +649,7 @@ jobs:
|
||||||
- determine_changes
|
- determine_changes
|
||||||
# Only runs on pull requests, since that is the only we way we can find the base version for comparison.
|
# Only runs on pull requests, since that is the only we way we can find the base version for comparison.
|
||||||
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
|
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') && github.event_name == 'pull_request' && (needs.determine_changes.outputs.ty == 'true' || needs.determine_changes.outputs.py-fuzzer == 'true') }}
|
||||||
timeout-minutes: 5
|
timeout-minutes: ${{ github.repository == 'astral-sh/ruff' && 5 || 20 }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue