Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions .github/workflows/add_label_automerge.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
name: Add label on auto-merge enabled

on:
pull_request_target:
types:
- auto_merge_enabled
pull_request_target:
types:
- auto_merge_enabled

jobs:
add-label-on-auto-merge:
runs-on: ubuntu-latest
steps:
- name: Add label
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['ready']
})
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
add-label-on-auto-merge:
runs-on: ubuntu-latest
steps:
- name: Add label
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['ready']
})
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
name: Lint GitHub Actions workflows
name: Lint GitHub Actions

on:
push:
branches:
- "main"
paths:
- '.github/workflows/*.ya?ml'
- '.github/workflows/actionlint.*'
- '.github/workflows/matchers/actionlint.json'
# Trigger the workflow on push or pull request, but only for the main branch.
# Don't use pull_request.paths filter since this workflow is required for
# all pull requests on main irrespective of file type or location.
pull_request:
branches:
- main
push:
branches:
- "main"
paths:
- '.github/workflows/*.ya?ml'
- '.github/workflows/actionlint.*'
- '.github/workflows/matchers/actionlint.json'

env:
LC_ALL: en_US.UTF-8
Expand All @@ -26,7 +24,7 @@ permissions:
contents: read

jobs:
actionlint:
lint-actions:
runs-on: ubuntu-latest
steps:
- name: "Checkout"
Expand All @@ -35,6 +33,8 @@ jobs:
fetch-depth: 0

- name: "Run actionlint"
run: |
echo "::add-matcher::.github/workflows/matchers/actionlint.json"
tools/actionlint.sh -color
uses: raven-actions/actionlint@v2
with:
matcher: true
cache: false
fail-on-error: true
29 changes: 9 additions & 20 deletions .github/workflows/lint_code.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
name: lint code
name: Lint Code

on:
# Trigger the workflow on push or pull request,
# but only for the main branch
# Trigger the workflow on push or pull request, but only for the main branch.
# Don't use pull_request.paths filter since this workflow is required for
# all pull requests on main irrespective of file type or location.
pull_request:
branches:
- main
push:
branches:
- main
paths:
- "**/*.py"
- pyproject.toml
- requirements-lint.txt
- .github/workflows/matchers/ruff.json
- .github/workflows/ruff.yml
pull_request:
branches:
- main
# This workflow is only relevant when one of the following files changes.
# However, we have github configured to expect and require this workflow
# to run and pass before github with auto-merge a pull request. Until github
# allows more flexible auto-merge policy, we can just run this on every PR.
# It doesn't take that long to run, anyway.
#paths:
# - "**/*.py"
# - pyproject.toml
# - requirements-lint.txt
# - .github/workflows/matchers/ruff.json
# - .github/workflows/ruff.yml
- .github/workflows/lint_code.yml

jobs:
ruff:
lint-code:
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
name: Lint documentation
name: Lint Docs

on:
push:
# Trigger the workflow on push or pull request, but only for the main branch.
# Don't use pull_request.paths filter since this workflow is required for
# all pull requests on main irrespective of file type or location.
pull_request:
branches:
- main
paths:
- "docs/**"
pull_request:
push:
branches:
- main
paths:
- "**/*.md"
- "docs/**"

jobs:
doc-lint:
lint-docs:
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -27,4 +29,4 @@ jobs:
- name: Install dependencies
run: uv sync --frozen --only-group lint
- name: Lint docs
run: tools/doc-lint.sh
run: tools/lint_docs.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: Lint shell scripts
name: Lint Scripts

on:
push:
branches:
- "main"
paths:
- '**/*.sh'
- '.github/workflows/shellcheck.yml'
# Trigger the workflow on push or pull request, but only for the main branch.
# Don't use pull_request.paths filter since this workflow is required for
# all pull requests on main irrespective of file type or location.
pull_request:
branches:
- main
push:
branches:
- "main"
paths:
- '**/*.sh'
- '.github/workflows/shellcheck.yml'
- '.github/workflows/lint_scripts.yml'

env:
LC_ALL: en_US.UTF-8
Expand All @@ -24,7 +25,7 @@ permissions:
contents: read

jobs:
shellcheck:
lint-scripts:
runs-on: ubuntu-latest
steps:
- name: "Checkout"
Expand All @@ -34,4 +35,4 @@ jobs:

- name: "Check shell scripts"
run: |
tools/shellcheck.sh
tools/lint_scripts.sh
17 changes: 0 additions & 17 deletions .github/workflows/matchers/actionlint.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Close inactive issues and PRs'
name: Close inactive issues and PRs

on:
schedule:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- "tests/**/*.py"
- "vllm_spyre/**/*.py"
- pyproject.toml
- .github/workflows/test-spyre.yml
- .github/workflows/test.yml
workflow_dispatch:

env:
Expand Down
32 changes: 12 additions & 20 deletions .github/workflows/mypy.yaml → .github/workflows/type_check.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
name: mypy
name: Type Check

on:
# Trigger the workflow on push or pull request,
# but only for the main branch
# Trigger the workflow on push or pull request, but only for the main branch.
# Don't use pull_request.paths filter since this workflow is required for
# all pull requests on main irrespective of file type or location.
pull_request:
branches:
- main
push:
branches:
- main
paths:
- '**/*.py'
- '.github/workflows/mypy.yaml'
- 'tools/mypy.sh'
- '.github/workflows/type_check.yaml'
- 'tools/type_check.sh'
- 'pyproject.toml'
pull_request:
branches:
- main
# This workflow is only relevant when one of the following files changes.
# However, we have github configured to expect and require this workflow
# to run and pass before github with auto-merge a pull request. Until github
# allows more flexible auto-merge policy, we can just run this on every PR.
# It doesn't take that long to run, anyway.
#paths:
# - '**/*.py'
# - '.github/workflows/mypy.yaml'
# - 'tools/mypy.sh'
# - 'pyproject.toml'

jobs:
mypy:
type-check:
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -39,6 +30,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
# TODO: use `uv`
python -m pip install --upgrade pip
pip install mypy==1.11.1
pip install types-setuptools
Expand All @@ -48,4 +40,4 @@ jobs:
- name: Mypy
run: |
echo "::add-matcher::.github/workflows/matchers/mypy.json"
tools/mypy.sh 1 ${{ matrix.python-version }}
tools/type_check.sh 1 ${{ matrix.python-version }}
8 changes: 4 additions & 4 deletions format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ echo 'vLLM yapf: Done'

# Run mypy
echo 'vLLM mypy:'
tools/mypy.sh
tools/type_check.sh
echo 'vLLM mypy: Done'


Expand Down Expand Up @@ -240,15 +240,15 @@ fi
echo 'vLLM isort: Done'

echo 'vLLM actionlint:'
tools/actionlint.sh -color
tools/lint_actions.sh -color
echo 'vLLM actionlint: Done'

echo 'vLLM shellcheck:'
tools/shellcheck.sh
tools/lint_scripts.sh
echo 'vLLM shellcheck: Done'

echo 'vLLM doc-lint:'
tools/doc-lint.sh
tools/lint_docs.sh
echo 'vLLM doc-lint: Done'

if ! git diff --quiet &>/dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ check_untyped_defs = true
follow_imports = "silent"

# After fixing type errors resulting from follow_imports: "skip" -> "silent",
# move the directory here and remove it from tools/mypy.sh
# move the directory here and remove it from tools/type_check.sh
files = [
]
# TODO(woosuk): Include the code from Megatron and HuggingFace.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.