Skip to content

Commit 8c36656

Browse files
authored
Merge pull request #59 from iambenkay/patch-1
chore: change ollama model versions in CI
2 parents bd637a0 + 33e1aa1 commit 8c36656

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

.github/workflows/ci.yaml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,19 @@ jobs:
108108
run: |
109109
set -e
110110
cargo binstall --force --locked cargo-component@0.21.1
111-
cargo binstall golem-cli@1.2.3 --locked --force --no-confirm
112111
cargo binstall wac-cli --locked --force --no-confirm
113112
- name: Start Ollama in Docker
114113
run: |
115114
set -e
116115
docker run -d --name ollama -p 11434:11434 ollama/ollama:latest
117116
timeout 60 bash -c 'until curl -f http://localhost:11434/api/version; do sleep 2; done'
118-
echo "Pulling Qwen2.5:1.5b"
119-
docker exec ollama ollama pull qwen2.5:1.5b
120-
echo "Pulling Gemma2:2b"
121-
docker exec ollama ollama pull gemma2:2b
117+
echo "Pulling Qwen3:1.7b"
118+
docker exec ollama ollama pull qwen3:1.7b
119+
echo "Pulling Gemma3:4b"
120+
docker exec ollama ollama pull gemma3:4b
122121
echo "Verifying models are available"
123-
docker exec ollama ollama list | grep -q "qwen2.5:1.5b" || exit 1
124-
docker exec ollama ollama list | grep -q "gemma2:2b" || exit 1
122+
docker exec ollama ollama list | grep -q "qwen3:1.7b" || exit 1
123+
docker exec ollama ollama list | grep -q "gemma3:4b" || exit 1
125124
echo "Ollama setup completed."
126125
- name: Install and Run latest Golem Server
127126
run: |
@@ -136,20 +135,20 @@ jobs:
136135
echo "Golem server started."
137136
- name: Build and test Ollama integration
138137
run: |
139-
set -e
138+
set -eo pipefail
140139
cargo make --cwd llm build-ollama
141140
cd test
142-
golem-cli app build -b ollama-debug
143-
golem-cli app deploy -b ollama-debug
144-
golem-cli worker new -e GOLEM_OLLAMA_BASE_URL=http://localhost:11434 test:llm/ollama-1
145-
golem-cli worker invoke test:llm/ollama-1 test1
146-
golem-cli worker invoke test:llm/ollama-1 test2
147-
golem-cli worker invoke test:llm/ollama-1 test3
148-
golem-cli worker invoke test:llm/ollama-1 test4
149-
golem-cli worker invoke test:llm/ollama-1 test5
150-
golem-cli worker invoke test:llm/ollama-1 test6
151-
golem-cli worker invoke test:llm/ollama-1 test7
152-
golem-cli worker invoke test:llm/ollama-1 test8
141+
golem app build -b ollama-debug
142+
golem app deploy -b ollama-debug
143+
golem worker new -e GOLEM_OLLAMA_BASE_URL=http://localhost:11434 test:llm/ollama-1
144+
golem worker invoke test:llm/ollama-1 test1 | grep -v "ERROR: "
145+
golem worker invoke test:llm/ollama-1 test2 | grep -v "ERROR: "
146+
golem worker invoke test:llm/ollama-1 test3 | grep -v "ERROR: "
147+
golem worker invoke test:llm/ollama-1 test4 | grep -v "ERROR: "
148+
golem worker invoke test:llm/ollama-1 test5 | grep -v "ERROR: "
149+
golem worker invoke test:llm/ollama-1 test6 | grep -v "ERROR: "
150+
golem worker invoke test:llm/ollama-1 test7 | grep -v "ERROR: "
151+
golem worker invoke test:llm/ollama-1 test8 | grep -v "ERROR: "
153152
publish-all:
154153
needs:
155154
- tests

test/components-rust/test-llm/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl Guest for Component {
153153
}
154154
llm::ChatEvent::Error(error) => {
155155
println!(
156-
"ERROR 1: {:?} {} ({})",
156+
"ERROR: (1) {:?} {} ({})",
157157
error.code,
158158
error.message,
159159
error.provider_error_json.unwrap_or_default()
@@ -195,7 +195,7 @@ impl Guest for Component {
195195
}
196196
llm::ChatEvent::Error(error) => {
197197
format!(
198-
"ERROR 2: {:?} {} ({})",
198+
"ERROR: (2) {:?} {} ({})",
199199
error.code,
200200
error.message,
201201
error.provider_error_json.unwrap_or_default()

0 commit comments

Comments
 (0)