Unverified Commit 62f99e08 authored by li chaoran's avatar li chaoran Committed by GitHub
Browse files

fix: wrong docker hub org name (#9137)


Signed-off-by: default avatarmywaaagh_admin <pkwarcraft@gmail.com>
parent 86a0be65
...@@ -38,7 +38,7 @@ jobs: ...@@ -38,7 +38,7 @@ jobs:
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: | images: |
${{ github.repository_owner }}/sglang lmsysorg/sglang
# push with schedule event # push with schedule event
# push with workflow_dispatch event # push with workflow_dispatch event
tags: | tags: |
...@@ -52,7 +52,7 @@ jobs: ...@@ -52,7 +52,7 @@ jobs:
# https://github.com/docker/login-action # https://github.com/docker/login-action
- name: Log into docker hub - name: Log into docker hub
uses: docker/login-action@v3 uses: docker/login-action@v3
if: ${{ github.repository_owner == 'sgl-project/sglang' && github.event_name != 'pull_request' }} if: ${{ github.repository == 'sgl-project/sglang' && github.event_name != 'pull_request' }}
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
...@@ -69,7 +69,7 @@ jobs: ...@@ -69,7 +69,7 @@ jobs:
platforms: linux/arm64 platforms: linux/arm64
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
push: ${{ github.repository_owner == 'sgl-project/sglang' && github.event_name != 'pull_request' }} push: ${{ github.repository == 'sgl-project/sglang' && github.event_name != 'pull_request' }}
provenance: false provenance: false
build-args: | build-args: |
CANN_VERSION=${{ matrix.cann_version }} CANN_VERSION=${{ matrix.cann_version }}
......
...@@ -33,20 +33,18 @@ jobs: ...@@ -33,20 +33,18 @@ jobs:
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: | images: |
${{ github.repository_owner }}/sglang lmsysorg/sglang
tags: | tags: |
type=ref,event=pr type=ref,event=pr
type=ref,event=tag,suffix=-cann${{ matrix.cann_version }}-${{ matrix.device_type }} type=ref,event=tag,suffix=-cann${{ matrix.cann_version }}-${{ matrix.device_type }}
flavor: | flavor: |
latest=false latest=false
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v3
# Login against a Docker registry except on PR # Login against a Docker registry except on PR
# https://github.com/docker/login-action # https://github.com/docker/login-action
- name: Login to Docker Hub - name: Login to Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v2
if: ${{ github.repository_owner == 'sgl-project/sglang' && github.event_name != 'pull_request' }} if: ${{ github.repository == 'sgl-project/sglang' && github.event_name != 'pull_request' }}
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
...@@ -55,7 +53,7 @@ jobs: ...@@ -55,7 +53,7 @@ jobs:
id: get_version id: get_version
run: | run: |
version=$(cat python/sglang/version.py | cut -d'"' -f2) version=$(cat python/sglang/version.py | cut -d'"' -f2)
echo "TAG=${{ github.repository_owner }}/sglang:v$version-cann${{ matrix.cann_version }}-${{ matrix.device_type }}" >> $GITHUB_OUTPUT echo "TAG=lmsysorg/sglang:v$version-cann${{ matrix.cann_version }}-${{ matrix.device_type }}" >> $GITHUB_OUTPUT
kernel_tag=$(curl -s https://api.github.com/repos/sgl-project/sgl-kernel-npu/tags | jq -r '.[0].name') kernel_tag=$(curl -s https://api.github.com/repos/sgl-project/sgl-kernel-npu/tags | jq -r '.[0].name')
echo "KERNEL_NPU_TAG=${kernel_tag}" >> $GITHUB_OUTPUT echo "KERNEL_NPU_TAG=${kernel_tag}" >> $GITHUB_OUTPUT
...@@ -69,7 +67,7 @@ jobs: ...@@ -69,7 +67,7 @@ jobs:
platforms: linux/arm64 platforms: linux/arm64
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.meta.outputs.tags || steps.get_version.outputs.TAG }} tags: ${{ steps.meta.outputs.tags || steps.get_version.outputs.TAG }}
push: ${{ github.repository_owner == 'sgl-project/sglang' && github.event_name != 'pull_request' }} push: ${{ github.repository == 'sgl-project/sglang' && github.event_name != 'pull_request' }}
provenance: false provenance: false
build-args: | build-args: |
SGLANG_KERNEL_NPU_TAG=${{ steps.get_version.outputs.KERNEL_NPU_TAG }} SGLANG_KERNEL_NPU_TAG=${{ steps.get_version.outputs.KERNEL_NPU_TAG }}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment