Skip to content

Commit 52edbe7

Browse files
committed
Merge branch 'main' into issue-2163
2 parents 3aba169 + 3cc15f7 commit 52edbe7

File tree

57 files changed

+1851
-779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1851
-779
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
# These owners will be the default owners for everything in
44
# the repo. Unless a later match takes precedence,
5-
* @ashwinb @yanxi0830 @hardikjshah @dltn @raghotham @dineshyv @vladimirivic @sixianyi0721 @ehhuang @terrytangyuan @SLR722 @leseb
5+
* @ashwinb @yanxi0830 @hardikjshah @raghotham @ehhuang @terrytangyuan @leseb @bbrowning

.github/TRIAGERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file documents Triage members in the Llama Stack community
2-
@franciscojavierarceo @leseb
2+
@bbrowning @booxter @franciscojavierarceo @leseb

.github/workflows/test-external-providers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ jobs:
4747
4848
- name: Create provider configuration
4949
run: |
50-
mkdir -p /tmp/providers.d/remote/inference
51-
cp tests/external-provider/llama-stack-provider-ollama/custom_ollama.yaml /tmp/providers.d/remote/inference/custom_ollama.yaml
50+
mkdir -p /home/runner/.llama/providers.d/remote/inference
51+
cp tests/external-provider/llama-stack-provider-ollama/custom_ollama.yaml /home/runner/.llama/providers.d/remote/inference/custom_ollama.yaml
5252
5353
- name: Build distro from config file
5454
run: |
@@ -66,7 +66,7 @@ jobs:
6666
- name: Wait for Llama Stack server to be ready
6767
run: |
6868
for i in {1..30}; do
69-
if ! grep -q "remote::custom_ollama from /tmp/providers.d/remote/inference/custom_ollama.yaml" server.log; then
69+
if ! grep -q "remote::custom_ollama from /home/runner/.llama/providers.d/remote/inference/custom_ollama.yaml" server.log; then
7070
echo "Waiting for Llama Stack server to load the provider..."
7171
sleep 1
7272
else

.github/workflows/update-readthedocs.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414
- 'docs/**'
1515
- 'pyproject.toml'
1616
- '.github/workflows/update-readthedocs.yml'
17+
tags:
18+
- '*'
1719
pull_request:
1820
branches:
1921
- main
@@ -61,7 +63,10 @@ jobs:
6163
6264
response=$(curl -X POST \
6365
-H "Content-Type: application/json" \
64-
-d "{\"token\": \"$TOKEN\"}" \
66+
-d "{
67+
\"token\": \"$TOKEN\",
68+
\"version\": \"$GITHUB_REF_NAME\"
69+
}" \
6570
https://readthedocs.org/api/v2/webhook/llama-stack/289768/)
6671
6772
echo "Response: $response"

0 commit comments

Comments
 (0)