minke.yu/sglang
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity

fix: patch docker image fixes (#19100)

Browse Source
This commit is contained in:
Douglas Yang
2026-02-23 16:34:29 -08:00
committed by GitHub
parent d160c5b9bb
commit 3a11e7dad9
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/patch-docker-dev.yml
+26 -10
View File
@@ -22,6 +22,8 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Login to Docker Hub - name: Login to Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v2
@@ -33,13 +35,18 @@ jobs:
run: | run: |
IMAGE="lmsysorg/sglang:${{ inputs.image_tag }}" IMAGE="lmsysorg/sglang:${{ inputs.image_tag }}"
docker pull "${IMAGE}" docker pull "${IMAGE}"
BASE_SHA=$(docker run --rm "${IMAGE}" git -C /sgl-workspace/sglang rev-parse HEAD) if BASE_SHA=$(docker run --rm "${IMAGE}" git -C /sgl-workspace/sglang rev-parse HEAD 2>/dev/null); then
echo "Image built from commit: ${BASE_SHA}" echo "Image built from commit: ${BASE_SHA}"
else
BASE_SHA=""
echo "::warning::Image has no .git directory — cannot extract base commit"
fi
echo "BASE_SHA=${BASE_SHA}" >> "$GITHUB_ENV" echo "BASE_SHA=${BASE_SHA}" >> "$GITHUB_ENV"
- name: Generate patches - name: Generate patches
run: | run: |
git fetch origin "${BASE_SHA}" git config --global --add safe.directory "$GITHUB_WORKSPACE"
git fetch origin main
mkdir -p /tmp/patch-ctx mkdir -p /tmp/patch-ctx
if [ -n "${{ inputs.pr_numbers }}" ]; then if [ -n "${{ inputs.pr_numbers }}" ]; then
@@ -48,14 +55,19 @@ jobs:
pr=$(echo "${pr}" | xargs) pr=$(echo "${pr}" | xargs)
echo "Fetching PR #${pr}" echo "Fetching PR #${pr}"
git fetch origin "pull/${pr}/head:pr-${pr}" git fetch origin "pull/${pr}/head:pr-${pr}"
git diff "${BASE_SHA}..pr-${pr}" > "/tmp/patch-ctx/${pr}.patch" MERGE_BASE=$(git merge-base origin/main "pr-${pr}")
echo " PR #${pr}: merge-base=${MERGE_BASE}"
git diff "${MERGE_BASE}..pr-${pr}" > "/tmp/patch-ctx/${pr}.patch"
echo " PR #${pr}: $(wc -l < /tmp/patch-ctx/${pr}.patch) lines" echo " PR #${pr}: $(wc -l < /tmp/patch-ctx/${pr}.patch) lines"
done done
else elif [ -n "${BASE_SHA}" ]; then
echo "Generating diff: image ${BASE_SHA} → latest main" echo "Generating diff: image ${BASE_SHA} → latest main"
git fetch origin main git fetch origin "${BASE_SHA}"
git diff "${BASE_SHA}..origin/main" > /tmp/patch-ctx/main.patch git diff "${BASE_SHA}..origin/main" > /tmp/patch-ctx/main.patch
echo " main: $(wc -l < /tmp/patch-ctx/main.patch) lines" echo " main: $(wc -l < /tmp/patch-ctx/main.patch) lines"
else
echo "::error::No PR numbers specified and image has no .git — cannot generate diff against main"
exit 1
fi fi
TOTAL=$(cat /tmp/patch-ctx/*.patch | wc -l) TOTAL=$(cat /tmp/patch-ctx/*.patch | wc -l)
@@ -75,9 +87,13 @@ jobs:
COPY *.patch /tmp/patches/ COPY *.patch /tmp/patches/
RUN cd /sgl-workspace/sglang \ RUN cd /sgl-workspace/sglang \
&& for p in /tmp/patches/*.patch; do \ && for p in /tmp/patches/*.patch; do \
echo "Applying ${p}..." \ if [ ! -s "${p}" ]; then \
&& git apply --stat "${p}" \ echo "Skipping ${p} (empty)"; \
&& git apply "${p}"; \ else \
echo "Applying ${p}..." \
&& patch -p1 --fuzz=2 --no-backup-if-mismatch -f < "${p}" \
|| { echo "ERROR: Failed to apply ${p}"; exit 1; }; \
fi; \
done \ done \
&& rm -rf /tmp/patches && rm -rf /tmp/patches
DOCKERFILE DOCKERFILE
@@ -95,5 +111,5 @@ jobs:
docker push "${IMAGE}" docker push "${IMAGE}"
echo "### Patched \`${IMAGE}\`" >> "$GITHUB_STEP_SUMMARY" echo "### Patched \`${IMAGE}\`" >> "$GITHUB_STEP_SUMMARY"
echo "- **Base commit:** \`${BASE_SHA}\`" >> "$GITHUB_STEP_SUMMARY" echo "- **Base commit:** \`${BASE_SHA:-unknown (no .git)}\`" >> "$GITHUB_STEP_SUMMARY"
echo "- **Source:** ${{ inputs.pr_numbers && format('PRs: {0}', inputs.pr_numbers) || 'latest main' }}" >> "$GITHUB_STEP_SUMMARY" echo "- **Source:** ${{ inputs.pr_numbers && format('PRs: {0}', inputs.pr_numbers) || 'latest main' }}" >> "$GITHUB_STEP_SUMMARY"