Skip to content

Commit 5c39a04

Browse files
committed
fix
Signed-off-by: wangli <[email protected]>
1 parent 169d21f commit 5c39a04

File tree

8 files changed

+30
-1
lines changed

8 files changed

+30
-1
lines changed

.github/workflows/image_310p_openeuler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ on:
4343
- 'CMakeLists.txt'
4444
- 'csrc/**'
4545

46+
concurrency:
47+
group: ${{ github.workflow }}-${{ github.ref }}
48+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
4649
jobs:
4750
build:
4851
name: vllm-ascend image build

.github/workflows/image_310p_ubuntu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ on:
4242
- 'cmake/**'
4343
- 'CMakeLists.txt'
4444
- 'csrc/**'
45+
46+
concurrency:
47+
group: ${{ github.workflow }}-${{ github.ref }}
48+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
4549
jobs:
4650

4751
build:

.github/workflows/image_a3_openeuler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ on:
4343
- 'CMakeLists.txt'
4444
- 'csrc/**'
4545

46+
concurrency:
47+
group: ${{ github.workflow }}-${{ github.ref }}
48+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
49+
4650
jobs:
4751
build:
4852
name: vllm-ascend image build

.github/workflows/image_a3_ubuntu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ on:
4242
- 'cmake/**'
4343
- 'CMakeLists.txt'
4444
- 'csrc/**'
45+
46+
concurrency:
47+
group: ${{ github.workflow }}-${{ github.ref }}
48+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
4549
jobs:
4650

4751
build:

.github/workflows/image_openeuler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ on:
4242
- 'CMakeLists.txt'
4343
- 'csrc/**'
4444

45+
concurrency:
46+
group: ${{ github.workflow }}-${{ github.ref }}
47+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
4548
jobs:
4649
build:
4750
name: vllm-ascend image build

.github/workflows/image_ubuntu.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ on:
4242
- 'cmake/**'
4343
- 'CMakeLists.txt'
4444
- 'csrc/**'
45+
46+
concurrency:
47+
group: ${{ github.workflow }}-${{ github.ref }}
48+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
4549
jobs:
4650

4751
build:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ jobs:
4141
env:
4242
SHELLCHECK_OPTS: "--exclude=SC2046,SC2006,SC2086"
4343
GOPROXY: "https://goproxy.cn,direct"
44+
SHELLCHECK_PATH: "/root/.cache/tools/shellcheck-stable"
4445
run: pre-commit run --all-files --hook-stage manual

tools/shellcheck.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ if [ -d "shellcheck-${scversion}" ]; then
2828
export PATH
2929
fi
3030

31+
# Optionally set SHELLCHECK_PATH to a directory containing shellcheck binary for CI use.
32+
if [ -d "$SHELLCHECK_PATH" ]; then
33+
PATH="$PATH:$SHELLCHECK_PATH"
34+
export PATH
35+
fi
36+
3137
if ! [ -x "$(command -v shellcheck)" ]; then
3238
if [ "$(uname -s)" != "Linux" ] || [ "$(uname -m)" != "x86_64" ]; then
3339
echo "Please install shellcheck: https://github.com/koalaman/shellcheck?tab=readme-ov-file#installing"
@@ -36,7 +42,7 @@ if ! [ -x "$(command -v shellcheck)" ]; then
3642

3743
# automatic local install if linux x86_64
3844
wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv
39-
PATH="$PATH:$(pwd)/shellcheck-${scversion}"
45+
export PATH="$PATH:$(pwd)/shellcheck-${scversion}"
4046
fi
4147

4248
while IFS= read -r -d '' file; do

0 commit comments

Comments
 (0)