Skip to content

Commit

Permalink
Remove darwin-only restriction on ollama (#5284)
Browse files Browse the repository at this point in the history
* Remove `darwin`-only restriction on `ollama`

Hopefully resolves pkgxdev/pkgx#975

* add -buildmode on linux

* ollama needs certs to pull from model registry

* certs needed at runtime

* add pkill for linux

* test pgrep

* pkill needs -x for exact match

---------

Co-authored-by: Jacob Heider <[email protected]>
  • Loading branch information
YellowApple and jhheider authored Feb 20, 2024
1 parent 4a8e84d commit 3223503
Showing 1 changed file with 27 additions and 7 deletions.
34 changes: 27 additions & 7 deletions projects/ollama.ai/package.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
distributable:
url: git+https://github.com/jmorganca/ollama
ref: v{{version}}

versions:
github: jmorganca/ollama
platforms:
- darwin # Available for macOS Windows & Linux support coming soon. <= from https://ollama.ai/

dependencies:
curl.se/ca-certs: '*'

build:
dependencies:
go.dev: ^1.21
Expand All @@ -16,20 +19,37 @@ build:
git submodule update
if: '>=0.0.18'
- go generate ./...
- go build .
- mkdir -p {{prefix}}/bin
- install ollama {{prefix}}/bin/
- go build -ldflags="$GO_LDFLAGS" -o '{{prefix}}/bin/ollama' .
env:
linux:
GO_LDFLAGS:
# else segfaults
- -buildmode=pie

provides:
- bin/ollama

test:
qa-required: true
dependencies:
linux:
gitlab.com/procps-ng/procps: '*'
script:
# 0.0.19 complains about a missing blobs directory
- run: mkdir -p ~/.ollama/models/blobs
if: =0.0.19
- killall ollama || true
# why is this killing the test, it seems like?
- run: pgrep -l ollama
if: linux
- $KILL ollama || true
- sleep 5
- ollama serve &
- sleep 5
- ollama create mario -f ./Modelfile
- ollama list | grep 'mario'
- killall ollama || true
- $KILL ollama || true
env:
darwin:
KILL: killall
linux:
KILL: pkill -x

0 comments on commit 3223503

Please sign in to comment.