From e96dd0309f7066640b8205a1dd71ce5e286a0f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= Date: Tue, 2 Jul 2024 12:20:13 +0200 Subject: [PATCH 1/3] gha: fix fetch step in upstream sync workflow --- .github/workflows/sync-with-upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-with-upstream.yml b/.github/workflows/sync-with-upstream.yml index 9e747de396edc..9d87ff4e50da6 100644 --- a/.github/workflows/sync-with-upstream.yml +++ b/.github/workflows/sync-with-upstream.yml @@ -79,7 +79,7 @@ jobs: echo "Checking if PR is up-to-date" - git fetch ${upstream_url} refs/pull/${pr_number}/head + git fetch origin refs/pull/${pr_number}/head if git diff --stat --exit-code upstream/main FETCH_HEAD; then echo "PR is up-to-date" exit 0 From b4ecf731b6b6452a8c73ca461c72afbeea55c974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= Date: Tue, 2 Jul 2024 12:36:38 +0200 Subject: [PATCH 2/3] gha: always update sync workflow PR body/title --- .github/workflows/sync-with-upstream.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/sync-with-upstream.yml b/.github/workflows/sync-with-upstream.yml index 9d87ff4e50da6..53751552f4d2e 100644 --- a/.github/workflows/sync-with-upstream.yml +++ b/.github/workflows/sync-with-upstream.yml @@ -77,14 +77,6 @@ jobs: exit 0 fi - echo "Checking if PR is up-to-date" - - git fetch origin refs/pull/${pr_number}/head - if git diff --stat --exit-code upstream/main FETCH_HEAD; then - echo "PR is up-to-date" - exit 0 - fi - echo "Updating PR \#${pr_number}" gh pr edit \ $pr_number \ From 3ff733b37471aaeefb70c391e132f0f0d37807ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Trifir=C3=B2?= Date: Wed, 3 Jul 2024 17:28:25 +0200 Subject: [PATCH 3/3] Dockerfile.ubi: bump vllm-tgis-adapter to 0.1.3 --- Dockerfile.ubi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 20bb7e7e2cb5e..822363161be2b 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -189,7 +189,7 @@ FROM vllm-openai as vllm-grpc-adapter USER root RUN --mount=type=cache,target=/root/.cache/pip \ - pip install vllm-tgis-adapter==0.1.2 + pip install vllm-tgis-adapter==0.1.3 ENV GRPC_PORT=8033 USER 2000