mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 09:53:45 +00:00
fix: use test.pypi for uv sync on release branches
The previous approach tried to install before uv sync, but there's no venv yet. The correct solution: - Release branches: Point UV_INDEX_URL to test.pypi so uv sync can resolve RC versions, then install exact git version after sync - Non-release branches: Run uv sync normally, then install git version if client-version=latest This lets uv sync create the venv first, then we install/override the client version as needed.
This commit is contained in:
parent
626639beee
commit
0815663211
3 changed files with 60 additions and 26 deletions
|
|
@ -7,45 +7,58 @@ inputs:
|
||||||
required: false
|
required: false
|
||||||
default: ""
|
default: ""
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
uv-index-url:
|
||||||
|
description: 'UV_INDEX_URL to use (set for release branches)'
|
||||||
|
value: ${{ steps.configure.outputs.uv-index-url }}
|
||||||
|
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:
|
runs:
|
||||||
using: "composite"
|
using: "composite"
|
||||||
steps:
|
steps:
|
||||||
- name: Install llama-stack-client
|
- name: Configure client installation
|
||||||
|
id: configure
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Determine the branch we're working with
|
# Determine the branch we're working with
|
||||||
# For PRs: use base_ref (target branch)
|
|
||||||
# For pushes: use ref (current branch)
|
|
||||||
BRANCH="${{ github.base_ref || github.ref }}"
|
BRANCH="${{ github.base_ref || github.ref }}"
|
||||||
BRANCH="${BRANCH#refs/heads/}" # Strip refs/heads/ prefix
|
BRANCH="${BRANCH#refs/heads/}"
|
||||||
|
|
||||||
echo "Working with branch: $BRANCH"
|
echo "Working with branch: $BRANCH"
|
||||||
|
|
||||||
# On release branches: always install from matching git branch to satisfy RC dependencies
|
# On release branches: use test.pypi for uv sync, then install from git
|
||||||
# On non-release branches: install based on client-version input
|
# On non-release branches: install based on client-version after sync
|
||||||
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
||||||
echo "Detected release branch: $BRANCH"
|
echo "Detected release branch: $BRANCH"
|
||||||
echo "Checking if matching branch exists in llama-stack-client-python..."
|
|
||||||
|
|
||||||
# Check if the branch exists in the client repo
|
# 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
|
if ! git ls-remote --exit-code --heads https://github.com/llamastack/llama-stack-client-python.git "$BRANCH" > /dev/null 2>&1; then
|
||||||
echo "Installing llama-stack-client-python from matching branch: $BRANCH"
|
|
||||||
uv pip install git+https://github.com/llamastack/llama-stack-client-python.git@$BRANCH
|
|
||||||
else
|
|
||||||
echo "::error::Branch $BRANCH not found in llama-stack-client-python repository"
|
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"
|
echo "::error::Please create the matching release branch in llama-stack-client-python before testing"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Configure to use test.pypi for sync (to resolve RC versions)
|
||||||
|
echo "uv-index-url=https://test.pypi.org/simple/" >> $GITHUB_OUTPUT
|
||||||
|
echo "uv-extra-index-url=https://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
|
elif [ -n "${{ inputs.client-version }}" ]; then
|
||||||
# Non-release branch with client-version specified
|
echo "::error::Invalid client-version: ${{ inputs.client-version }}"
|
||||||
if [ "${{ inputs.client-version }}" = "latest" ]; then
|
exit 1
|
||||||
echo "Installing latest llama-stack-client-python from main branch"
|
|
||||||
uv pip install git+https://github.com/llamastack/llama-stack-client-python.git@main
|
|
||||||
elif [ "${{ inputs.client-version }}" = "published" ]; then
|
|
||||||
echo "Installing published llama-stack-client-python from PyPI"
|
|
||||||
uv pip install llama-stack-client
|
|
||||||
else
|
|
||||||
echo "Invalid client-version: ${{ inputs.client-version }}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
12
.github/actions/setup-runner/action.yml
vendored
12
.github/actions/setup-runner/action.yml
vendored
|
|
@ -18,13 +18,17 @@ runs:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version: ${{ inputs.python-version }}
|
||||||
version: 0.7.6
|
version: 0.7.6
|
||||||
|
|
||||||
- name: Install llama-stack-client
|
- name: Configure client installation
|
||||||
|
id: client-config
|
||||||
uses: ./.github/actions/install-llama-stack-client
|
uses: ./.github/actions/install-llama-stack-client
|
||||||
with:
|
with:
|
||||||
client-version: ${{ inputs.client-version }}
|
client-version: ${{ inputs.client-version }}
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
UV_INDEX_URL: ${{ steps.client-config.outputs.uv-index-url }}
|
||||||
|
UV_EXTRA_INDEX_URL: ${{ steps.client-config.outputs.uv-extra-index-url }}
|
||||||
run: |
|
run: |
|
||||||
echo "Updating project dependencies via uv sync"
|
echo "Updating project dependencies via uv sync"
|
||||||
uv sync --all-groups
|
uv sync --all-groups
|
||||||
|
|
@ -32,5 +36,11 @@ runs:
|
||||||
echo "Installing ad-hoc dependencies"
|
echo "Installing ad-hoc dependencies"
|
||||||
uv pip install faiss-cpu
|
uv pip install faiss-cpu
|
||||||
|
|
||||||
|
# Install specific client version after sync if needed
|
||||||
|
if [ "${{ steps.client-config.outputs.install-after-sync }}" = "true" ]; then
|
||||||
|
echo "Installing llama-stack-client from: ${{ steps.client-config.outputs.install-source }}"
|
||||||
|
uv pip install ${{ steps.client-config.outputs.install-source }}
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Installed llama packages"
|
echo "Installed llama packages"
|
||||||
uv pip list | grep llama
|
uv pip list | grep llama
|
||||||
|
|
|
||||||
15
.github/workflows/pre-commit.yml
vendored
15
.github/workflows/pre-commit.yml
vendored
|
|
@ -130,11 +130,22 @@ jobs:
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Install llama-stack-client
|
- name: Configure client installation
|
||||||
|
id: client-config
|
||||||
uses: ./.github/actions/install-llama-stack-client
|
uses: ./.github/actions/install-llama-stack-client
|
||||||
|
|
||||||
- name: Sync dev + type_checking dependencies
|
- name: Sync dev + type_checking dependencies
|
||||||
run: uv sync --group dev --group type_checking
|
env:
|
||||||
|
UV_INDEX_URL: ${{ steps.client-config.outputs.uv-index-url }}
|
||||||
|
UV_EXTRA_INDEX_URL: ${{ steps.client-config.outputs.uv-extra-index-url }}
|
||||||
|
run: |
|
||||||
|
uv sync --group dev --group type_checking
|
||||||
|
|
||||||
|
# Install specific client version after sync if needed
|
||||||
|
if [ "${{ steps.client-config.outputs.install-after-sync }}" = "true" ]; then
|
||||||
|
echo "Installing llama-stack-client from: ${{ steps.client-config.outputs.install-source }}"
|
||||||
|
uv pip install ${{ steps.client-config.outputs.install-source }}
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Run mypy (full type_checking)
|
- name: Run mypy (full type_checking)
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue