From d0bc16859cad1221d9f304cadb9e38f53aeb624e Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Fri, 6 Feb 2026 14:06:27 +0800 Subject: [PATCH] [CI][Misc] Some improvement for github action (#6587) ### What this PR does / why we need it? - This PR removes several self-hosted runner labels from the `actionlint.yaml` configuration file. These runners are likely no longer in use, so this change cleans up the configuration and ensures `actionlint` has an accurate list of available runners. - Move all Action dockerfiles to one folder - remove useless `runner` input for e2e test. - update workflow option version ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? This is a configuration change for the CI linter. The correctness will be verified by `actionlint` running in CI on subsequent pull requests. - vLLM version: v0.15.0 - vLLM main: https://github.com/vllm-project/vllm/commit/d7e17aaacd5ed1b4b4be6bcfef3a1b7cbc84fc9a Signed-off-by: wangxiyuan --- .github/actionlint.yaml | 9 --------- .github/workflows/_e2e_test.yaml | 3 --- .../{ => workflows/dockerfiles}/Dockerfile.buildwheel | 0 .../{ => workflows/dockerfiles}/Dockerfile.nightly.a2 | 0 .../{ => workflows/dockerfiles}/Dockerfile.nightly.a3 | 0 .github/workflows/pr_test_full.yaml | 1 - .github/workflows/pr_test_light.yaml | 1 - .github/workflows/schedule_image_build_and_push.yaml | 2 +- .github/workflows/schedule_nightly_image_build.yaml | 2 +- .github/workflows/schedule_release_code_and_wheel.yml | 4 ++-- .github/workflows/schedule_test_vllm_main.yaml | 1 - 11 files changed, 4 insertions(+), 19 deletions(-) rename .github/{ => workflows/dockerfiles}/Dockerfile.buildwheel (100%) rename .github/{ => workflows/dockerfiles}/Dockerfile.nightly.a2 (100%) rename .github/{ => workflows/dockerfiles}/Dockerfile.nightly.a3 (100%) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 1dc25711..f9fa5108 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,23 +1,14 @@ self-hosted-runner: # Labels of self-hosted runner in array of strings. labels: - - linux-aarch64-a2-0 - - linux-aarch64-a2-1 - - linux-aarch64-a2-2 - - linux-aarch64-a2-4 - - linux-aarch64-a2-8 - linux-arm64-npu-static-8 - linux-aarch64-310p-1 - linux-aarch64-310p-2 - linux-aarch64-310p-4 - - ubuntu-24.04-arm - linux-aarch64-a3-1 - linux-aarch64-a3-2 - linux-aarch64-a3-4 - linux-aarch64-a3-8 - - linux-amd64-cpu-0 - - linux-amd64-cpu-8 - - linux-amd64-cpu-16 - linux-aarch64-a3-0 - linux-amd64-cpu-8-hk - linux-amd64-cpu-16-hk diff --git a/.github/workflows/_e2e_test.yaml b/.github/workflows/_e2e_test.yaml index 8b180670..758b35ef 100644 --- a/.github/workflows/_e2e_test.yaml +++ b/.github/workflows/_e2e_test.yaml @@ -6,9 +6,6 @@ on: vllm: required: true type: string - runner: - required: true - type: string image: required: true type: string diff --git a/.github/Dockerfile.buildwheel b/.github/workflows/dockerfiles/Dockerfile.buildwheel similarity index 100% rename from .github/Dockerfile.buildwheel rename to .github/workflows/dockerfiles/Dockerfile.buildwheel diff --git a/.github/Dockerfile.nightly.a2 b/.github/workflows/dockerfiles/Dockerfile.nightly.a2 similarity index 100% rename from .github/Dockerfile.nightly.a2 rename to .github/workflows/dockerfiles/Dockerfile.nightly.a2 diff --git a/.github/Dockerfile.nightly.a3 b/.github/workflows/dockerfiles/Dockerfile.nightly.a3 similarity index 100% rename from .github/Dockerfile.nightly.a3 rename to .github/workflows/dockerfiles/Dockerfile.nightly.a3 diff --git a/.github/workflows/pr_test_full.yaml b/.github/workflows/pr_test_full.yaml index 1b7e0ade..807db427 100644 --- a/.github/workflows/pr_test_full.yaml +++ b/.github/workflows/pr_test_full.yaml @@ -81,7 +81,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: ${{ matrix.vllm_version }} - runner: linux-aarch64-a2b3 image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 contains_310: false type: full diff --git a/.github/workflows/pr_test_light.yaml b/.github/workflows/pr_test_light.yaml index ac19f308..cd9bf18b 100644 --- a/.github/workflows/pr_test_light.yaml +++ b/.github/workflows/pr_test_light.yaml @@ -107,7 +107,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: ${{ matrix.vllm_version }} - runner: linux-aarch64-a2b3 image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 contains_310: ${{ needs.changes.outputs._310_tracker == 'true' }} type: light diff --git a/.github/workflows/schedule_image_build_and_push.yaml b/.github/workflows/schedule_image_build_and_push.yaml index 238c9b90..c0dbf8d1 100644 --- a/.github/workflows/schedule_image_build_and_push.yaml +++ b/.github/workflows/schedule_image_build_and_push.yaml @@ -32,7 +32,7 @@ on: - main - v0.15.0rc1 - v0.14.0rc1 - - v0.13.0rc2 + - v0.13.0rc3 jobs: image_build: diff --git a/.github/workflows/schedule_nightly_image_build.yaml b/.github/workflows/schedule_nightly_image_build.yaml index 92f9920f..aaf56074 100644 --- a/.github/workflows/schedule_nightly_image_build.yaml +++ b/.github/workflows/schedule_nightly_image_build.yaml @@ -46,7 +46,7 @@ jobs: docker build \ --network host \ --platform linux/arm64 \ - -f .github/Dockerfile.nightly.${TARGET} \ + -f .github/workflows/dockerfiles/Dockerfile.nightly.${TARGET} \ --build-arg CANN_VERSION="8.5.0" \ --build-arg UBUNTU_VERSION="22.04" \ --build-arg PYTHON_VERSION="3.11" \ diff --git a/.github/workflows/schedule_release_code_and_wheel.yml b/.github/workflows/schedule_release_code_and_wheel.yml index 6eeb2932..4428668c 100644 --- a/.github/workflows/schedule_release_code_and_wheel.yml +++ b/.github/workflows/schedule_release_code_and_wheel.yml @@ -35,7 +35,7 @@ on: - main - v0.15.0rc1 - v0.14.0rc1 - - v0.13.0rc2 + - v0.13.0rc3 jobs: build_and_release_code: @@ -114,7 +114,7 @@ jobs: - name: Build wheel run: | ls - docker build -f ./.github/Dockerfile.buildwheel \ + docker build -f ./.github/workflows/dockerfiles/Dockerfile.buildwheel \ --build-arg PY_VERSION=${{ matrix.python-version }} \ -t wheel:v1 . docker run --rm \ diff --git a/.github/workflows/schedule_test_vllm_main.yaml b/.github/workflows/schedule_test_vllm_main.yaml index 6e736a4e..b60fbb0c 100644 --- a/.github/workflows/schedule_test_vllm_main.yaml +++ b/.github/workflows/schedule_test_vllm_main.yaml @@ -34,7 +34,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: main - runner: linux-aarch64-a2b3 image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 contains_310: false type: full