From 8b878e9d4873bd6130be395ec265deb41182b0a5 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Sat, 1 Nov 2025 12:54:19 -0700 Subject: [PATCH] fix(ci): export UV_INDEX_STRATEGY to current shell before running uv sync (#4019) Fixes #4017 follow-up issue where UV_INDEX_STRATEGY was only exported to GITHUB_ENV but not to the current shell. The commit e0bb7529 fixed the empty string issue but introduced a new bug: UV_INDEX_STRATEGY was only exported to GITHUB_ENV (for subsequent steps), not to the current shell environment. Since uv sync runs in the same step, it never saw the variable. This caused all CI runs on release-0.3.x to fail with dependency resolution errors like: ``` setuptools was found on https://test.pypi.org/simple/, but not at the requested version. A compatible version may be available on PyPI. Use --index-strategy unsafe-best-match. ``` This fix adds `export UV_INDEX_STRATEGY=unsafe-best-match` to make the variable available in the current shell before running uv commands. Note: Main branch doesn't hit this bug because UV_EXTRA_INDEX_URL is only set on release branches. --- .github/actions/setup-runner/action.yml | 7 ++++--- llama_stack/ui/package-lock.json | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml index cf31101e4..3237abb67 100644 --- a/.github/actions/setup-runner/action.yml +++ b/.github/actions/setup-runner/action.yml @@ -29,11 +29,12 @@ runs: env: UV_EXTRA_INDEX_URL: ${{ steps.client-config.outputs.uv-extra-index-url }} run: | - # Export UV env vars to GITHUB_ENV so they persist across steps + # Export UV env vars for current step and persist to GITHUB_ENV for subsequent steps if [ -n "$UV_EXTRA_INDEX_URL" ]; then + export UV_INDEX_STRATEGY=unsafe-best-match echo "UV_EXTRA_INDEX_URL=$UV_EXTRA_INDEX_URL" >> $GITHUB_ENV - echo "UV_INDEX_STRATEGY=unsafe-best-match" >> $GITHUB_ENV - echo "Exported UV environment variables for subsequent steps" + echo "UV_INDEX_STRATEGY=$UV_INDEX_STRATEGY" >> $GITHUB_ENV + echo "Exported UV environment variables for current and subsequent steps" fi echo "Updating project dependencies via uv sync" diff --git a/llama_stack/ui/package-lock.json b/llama_stack/ui/package-lock.json index 8e93fc5ab..32d77c136 100644 --- a/llama_stack/ui/package-lock.json +++ b/llama_stack/ui/package-lock.json @@ -18,7 +18,7 @@ "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "framer-motion": "^12.23.24", - "llama-stack-client": "^0.3.0", + "llama-stack-client": "^0.3.1", "lucide-react": "^0.545.0", "next": "15.5.4", "next-auth": "^4.24.11", @@ -9635,9 +9635,9 @@ "license": "MIT" }, "node_modules/llama-stack-client": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/llama-stack-client/-/llama-stack-client-0.3.0.tgz", - "integrity": "sha512-76K/t1doaGmlBbDxCADaral9Vccvys9P8pqAMIhwBhMAqWudCEORrMMhUSg+pjhamWmEKj3wa++d4zeOGbfN/w==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/llama-stack-client/-/llama-stack-client-0.3.1.tgz", + "integrity": "sha512-4aYoF2aAQiBSfxyZEtczeQmJn8q9T22ePDqGhR+ej5RG6a8wvl5B3v7ZoKuFkft+vcP/kbJ58GQZEPLekxekZA==", "license": "MIT", "dependencies": { "@types/node": "^18.11.18",