diff --git a/.github/actions/run-and-record-tests/action.yml b/.github/actions/run-and-record-tests/action.yml index 1406c6077..6d2916b0b 100644 --- a/.github/actions/run-and-record-tests/action.yml +++ b/.github/actions/run-and-record-tests/action.yml @@ -36,7 +36,7 @@ runs: - name: Run Integration Tests shell: bash run: | - ./scripts/integration-tests.sh \ + uv run ./scripts/integration-tests.sh \ --stack-config '${{ inputs.stack-config }}' \ --provider '${{ inputs.provider }}' \ --test-subdirs '${{ inputs.test-subdirs }}' \ diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml index 2864715d6..fb14995c0 100644 --- a/.github/actions/setup-runner/action.yml +++ b/.github/actions/setup-runner/action.yml @@ -21,15 +21,11 @@ runs: - name: Install dependencies shell: bash run: | - VENV_NAME="github-actions-runner" - uv venv $VENV_NAME - source $VENV_NAME/bin/activate - + echo "Updating project dependencies via uv sync" uv sync --all-groups - uv pip install ollama faiss-cpu - # You must install llama-stack first because otherwise it will overwrite llama-stack-client-python - uv pip install -e . + echo "Installing ad-hoc dependencies" + uv pip install ollama faiss-cpu # Install llama-stack-client-python based on the client-version input if [ "${{ inputs.client-version }}" = "latest" ]; then diff --git a/.github/actions/setup-test-environment/action.yml b/.github/actions/setup-test-environment/action.yml index 3bd728964..6031531ad 100644 --- a/.github/actions/setup-test-environment/action.yml +++ b/.github/actions/setup-test-environment/action.yml @@ -42,8 +42,8 @@ runs: - name: Build Llama Stack shell: bash run: | - echo $VIRTUAL_ENV - uv run --active llama stack build --template ci-tests --image-type venv + echo "Building Llama Stack" + uv run llama stack build --template ci-tests --image-type venv - name: Configure git for commits shell: bash diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh index b466d05f5..58f54b426 100755 --- a/scripts/integration-tests.sh +++ b/scripts/integration-tests.sh @@ -111,12 +111,8 @@ echo "Inference Mode: $INFERENCE_MODE" echo "Test Pattern: $TEST_PATTERN" echo "" +echo "VIRTUAL_ENV: $VIRTUAL_ENV" echo "Packages installed:" -uv venv list -echo "Packages installed in active venv:" -uv run --active pip list - -echo "Packages installed in llama-stack venv:" uv pip list # Check storage and memory before tests