mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 18:00:36 +00:00
refactor: extract client install logic into reusable action
Moved the release branch detection and client pre-install logic into a dedicated action to eliminate duplication between setup-runner and pre-commit workflows.
This commit is contained in:
parent
afa9f08823
commit
c86e6e906a
3 changed files with 41 additions and 50 deletions
34
.github/actions/install-client-for-release/action.yml
vendored
Normal file
34
.github/actions/install-client-for-release/action.yml
vendored
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
name: Install Client for Release Branch
|
||||||
|
description: Pre-install llama-stack-client from git on release branches to satisfy RC dependencies before uv sync
|
||||||
|
|
||||||
|
runs:
|
||||||
|
using: "composite"
|
||||||
|
steps:
|
||||||
|
- name: Install client from release branch if needed
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
# 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="${BRANCH#refs/heads/}" # Strip refs/heads/ prefix
|
||||||
|
|
||||||
|
echo "Working with branch: $BRANCH"
|
||||||
|
|
||||||
|
# If on a release branch, install from matching release branch BEFORE uv sync
|
||||||
|
# This allows uv sync to resolve dependencies that reference unreleased RC versions
|
||||||
|
# We always do this on release branches regardless of client-version to satisfy pyproject.toml
|
||||||
|
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
||||||
|
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
|
||||||
|
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::Please create the matching release branch in llama-stack-client-python before testing"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
29
.github/actions/setup-runner/action.yml
vendored
29
.github/actions/setup-runner/action.yml
vendored
|
|
@ -18,34 +18,15 @@ runs:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version: ${{ inputs.python-version }}
|
||||||
version: 0.7.6
|
version: 0.7.6
|
||||||
|
|
||||||
|
- name: Pre-install client for release branches
|
||||||
|
uses: ./.github/actions/install-client-for-release
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Determine the branch we're working with
|
# Determine the branch we're working with (needed for post-install logic)
|
||||||
# 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"
|
|
||||||
|
|
||||||
# If on a release branch, install from matching release branch BEFORE uv sync
|
|
||||||
# This allows uv sync to resolve dependencies that reference unreleased RC versions
|
|
||||||
# We always do this on release branches regardless of client-version to satisfy pyproject.toml
|
|
||||||
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
|
||||||
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
|
|
||||||
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::Please create the matching release branch in llama-stack-client-python before testing"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Updating project dependencies via uv sync"
|
echo "Updating project dependencies via uv sync"
|
||||||
uv sync --all-groups
|
uv sync --all-groups
|
||||||
|
|
|
||||||
28
.github/workflows/pre-commit.yml
vendored
28
.github/workflows/pre-commit.yml
vendored
|
|
@ -130,32 +130,8 @@ jobs:
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Install client from release branch if needed
|
- name: Pre-install client for release branches
|
||||||
run: |
|
uses: ./.github/actions/install-client-for-release
|
||||||
# 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="${BRANCH#refs/heads/}" # Strip refs/heads/ prefix
|
|
||||||
|
|
||||||
echo "Working with branch: $BRANCH"
|
|
||||||
|
|
||||||
# If on a release branch, install from matching release branch BEFORE uv sync
|
|
||||||
# This allows uv sync to resolve dependencies that reference unreleased RC versions
|
|
||||||
if [[ "$BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x$ ]]; then
|
|
||||||
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
|
|
||||||
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::Please create the matching release branch in llama-stack-client-python before testing"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Sync dev + type_checking dependencies
|
- name: Sync dev + type_checking dependencies
|
||||||
run: uv sync --group dev --group type_checking
|
run: uv sync --group dev --group type_checking
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue