diff --git a/.github/workflows/_schedule_image_build.yaml b/.github/workflows/_schedule_image_build.yaml index dc606f7c..998051cd 100644 --- a/.github/workflows/_schedule_image_build.yaml +++ b/.github/workflows/_schedule_image_build.yaml @@ -89,8 +89,10 @@ jobs: fi branch="${branch:-main}" else - # For branch push / schedule / workflow_dispatch, use the triggering branch name - branch="${{ github.ref_name }}" + # For PR events github.ref_name is "/merge" which has no cached image; + # use base_ref (target branch) instead. For push/schedule, base_ref is empty so + # fall back to ref_name which is the actual branch name. + branch="${{ github.base_ref || github.ref_name }}" fi # Replace / with - for use in image tags branch="${branch//\//-}" diff --git a/Dockerfile.a3.openEuler b/Dockerfile.a3.openEuler index 75ef096d..1973f501 100644 --- a/Dockerfile.a3.openEuler +++ b/Dockerfile.a3.openEuler @@ -22,7 +22,7 @@ ARG MOONCAKE_TAG="v0.3.8.post1" WORKDIR /workspace -COPY ./tools/mooncake_installer.sh /vllm-workspace/vllm-ascend/ +COPY ./tools/mooncake_installer.sh /vllm-workspace/ SHELL ["/bin/bash", "-c"] @@ -30,7 +30,7 @@ SHELL ["/bin/bash", "-c"] RUN yum update -y && \ yum install -y git vim wget net-tools gcc gcc-c++ make cmake numactl-devel jemalloc clang && \ git clone --depth 1 --branch ${MOONCAKE_TAG} https://github.com/kvcache-ai/Mooncake /vllm-workspace/Mooncake && \ - cp /vllm-workspace/mooncake_installer.sh /vllm-workspace/Mooncake/ && \ + mv /vllm-workspace/mooncake_installer.sh /vllm-workspace/Mooncake/ && \ ARCH=$(uname -m) && \ source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/devlib:/usr/local/Ascend/ascend-toolkit/latest/${ARCH}-linux/lib64:$LD_LIBRARY_PATH && \ diff --git a/Dockerfile.openEuler b/Dockerfile.openEuler index 2f2fe086..03d6c096 100644 --- a/Dockerfile.openEuler +++ b/Dockerfile.openEuler @@ -18,10 +18,11 @@ FROM quay.io/ascend/cann:8.5.0-910b-openeuler24.03-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" +ARG MOONCAKE_TAG="v0.3.8.post1" WORKDIR /workspace -COPY ./tools/mooncake_installer.sh /vllm-workspace/vllm-ascend/ +COPY ./tools/mooncake_installer.sh /vllm-workspace/ SHELL ["/bin/bash", "-c"] @@ -56,7 +57,6 @@ RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm && \ python3 -m pip cache purge # Install vllm-ascend -ARG MOONCAKE_TAG="v0.3.8.post1" ARG SOC_VERSION="ascend910b1" ENV SOC_VERSION=$SOC_VERSION \ TASK_QUEUE_ENABLE=1 \