mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 09:53:45 +00:00
Backport of #4001 to release-0.3.x branch. Fixes CI failures on release branches where uv sync can't resolve RC dependencies. ## The Problem On release branches like `release-0.3.x`, pyproject.toml requires `llama-stack-client>=0.3.1rc1`. RC versions only exist on test.pypi, not PyPI. This causes multiple CI failures: 1. `uv sync` fails because it can't resolve RC versions from PyPI 2. pre-commit hooks (uv-lock, codegen) fail for the same reason 3. mypy workflow section needs uv installed ## The Solution Configure UV to use test.pypi when on release branches: - Set `UV_INDEX_URL=https://test.pypi.org/simple/` (primary) - Set `UV_EXTRA_INDEX_URL=https://pypi.org/simple/` (fallback) - Set `UV_INDEX_STRATEGY=unsafe-best-match` to check both indexes This allows `uv sync` to resolve common packages from PyPI and RC versions from test.pypi. ## Additional Fixes - Export UV env vars to `GITHUB_ENV` so pre-commit hooks inherit them - Install uv in pre-commit workflow for mypy section - Handle missing `type_checking` dependency group on release-0.3.x - Regenerate uv.lock with RC versions for the release branch ## Changes - Created reusable `install-llama-stack-client` action for configuration - Modified `setup-runner` to set UV environment variables before sync - Modified `pre-commit` workflow to configure client and export env vars - Updated uv.lock with RC versions from test.pypi This is a cherry-pick of commitsafa9f0882,c86e6e906,626639bee, and081566321from main, plus additional fixes for release branch compatibility.
60 lines
2.7 KiB
YAML
60 lines
2.7 KiB
YAML
name: Install llama-stack-client
|
|
description: Install llama-stack-client based on branch context and client-version input
|
|
|
|
inputs:
|
|
client-version:
|
|
description: 'Client version to install on non-release branches (latest or published). Ignored on release branches.'
|
|
required: false
|
|
default: ""
|
|
|
|
outputs:
|
|
uv-extra-index-url:
|
|
description: 'UV_EXTRA_INDEX_URL to use (set for release branches)'
|
|
value: ${{ steps.configure.outputs.uv-extra-index-url }}
|
|
install-after-sync:
|
|
description: 'Whether to install client after uv sync'
|
|
value: ${{ steps.configure.outputs.install-after-sync }}
|
|
install-source:
|
|
description: 'Where to install client from after sync'
|
|
value: ${{ steps.configure.outputs.install-source }}
|
|
|
|
runs:
|
|
using: "composite"
|
|
steps:
|
|
- name: Configure client installation
|
|
id: configure
|
|
shell: bash
|
|
run: |
|
|
# Determine the branch we're working with
|
|
BRANCH="${{ github.base_ref || github.ref }}"
|
|
BRANCH="${BRANCH#refs/heads/}"
|
|
|
|
echo "Working with branch: $BRANCH"
|
|
|
|
# On release branches: use test.pypi for uv sync, then install from git
|
|
# On non-release branches: install based on client-version after sync
|
|
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
|
echo "Detected release branch: $BRANCH"
|
|
|
|
# Check if matching branch exists in client repo
|
|
if ! git ls-remote --exit-code --heads https://github.com/llamastack/llama-stack-client-python.git "$BRANCH" > /dev/null 2>&1; then
|
|
echo "::error::Branch $BRANCH not found in llama-stack-client-python repository"
|
|
echo "::error::Please create the matching release branch in llama-stack-client-python before testing"
|
|
exit 1
|
|
fi
|
|
|
|
# Configure to use test.pypi as extra index (PyPI is primary)
|
|
echo "uv-extra-index-url=https://test.pypi.org/simple/" >> $GITHUB_OUTPUT
|
|
echo "install-after-sync=true" >> $GITHUB_OUTPUT
|
|
echo "install-source=git+https://github.com/llamastack/llama-stack-client-python.git@$BRANCH" >> $GITHUB_OUTPUT
|
|
elif [ "${{ inputs.client-version }}" = "latest" ]; then
|
|
# Install from main git after sync
|
|
echo "install-after-sync=true" >> $GITHUB_OUTPUT
|
|
echo "install-source=git+https://github.com/llamastack/llama-stack-client-python.git@main" >> $GITHUB_OUTPUT
|
|
elif [ "${{ inputs.client-version }}" = "published" ]; then
|
|
# Use published version from PyPI (installed by sync)
|
|
echo "install-after-sync=false" >> $GITHUB_OUTPUT
|
|
elif [ -n "${{ inputs.client-version }}" ]; then
|
|
echo "::error::Invalid client-version: ${{ inputs.client-version }}"
|
|
exit 1
|
|
fi
|