Skip to content

Commit 3dfab2c

Browse files
committed
Refactor ollama workflow for improved readability and structure; add 'devproxyrc' to VSCode settings
1 parent 2ca59a7 commit 3dfab2c

2 files changed

Lines changed: 50 additions & 48 deletions

File tree

.github/workflows/ollama.yml

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,55 @@
11
name: ollama smoke tests
22
permissions:
3-
contents: read
3+
contents: read
44
on:
5-
workflow_dispatch:
6-
release:
7-
types:
8-
- published
9-
pull_request:
10-
paths:
11-
- yarn.lock
12-
- ".github/workflows/ollama.yml"
13-
- "packages/core/**/*"
14-
- "packages/cli/**/*"
15-
- "packages/samples/**/*"
5+
workflow_dispatch:
6+
release:
7+
types:
8+
- published
9+
pull_request:
10+
paths:
11+
- yarn.lock
12+
- ".github/workflows/ollama.yml"
13+
- "packages/core/**/*"
14+
- "packages/cli/**/*"
15+
- "packages/samples/**/*"
1616
concurrency:
17-
group: ${{ github.workflow }}-${{ github.ref }}-ollama
18-
cancel-in-progress: true
17+
group: ${{ github.workflow }}-${{ github.ref }}-ollama
18+
cancel-in-progress: true
1919
env:
20-
GENAISCRIPT_DEFAULT_REASONING_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_REASONING_MODEL }}
21-
GENAISCRIPT_DEFAULT_REASONING_SMALL_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_REASONING_SMALL_MODEL }}
22-
GENAISCRIPT_DEFAULT_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_MODEL }}
23-
GENAISCRIPT_DEFAULT_SMALL_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_SMALL_MODEL }}
24-
GENAISCRIPT_DEFAULT_VISION_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_VISION_MODEL }}
20+
GENAISCRIPT_DEFAULT_REASONING_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_REASONING_MODEL }}
21+
GENAISCRIPT_DEFAULT_REASONING_SMALL_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_REASONING_SMALL_MODEL }}
22+
GENAISCRIPT_DEFAULT_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_MODEL }}
23+
GENAISCRIPT_DEFAULT_SMALL_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_SMALL_MODEL }}
24+
GENAISCRIPT_DEFAULT_VISION_MODEL: ${{ vars.GENAISCRIPT_DEFAULT_VISION_MODEL }}
2525
jobs:
26-
tests:
27-
runs-on: ubuntu-latest
28-
env:
29-
OLLAMA_HOST: "http://localhost:11434"
30-
steps:
31-
- uses: actions/checkout@v4
32-
with:
33-
submodules: "recursive"
34-
fetch-depth: 0
35-
- uses: pnpm/action-setup@v4
36-
- uses: actions/setup-node@v4
37-
with:
38-
node-version: "22"
39-
cache: pnpm
40-
- uses: dev-proxy-tools/actions/install@v1
41-
- uses: dev-proxy-tools/actions/start@v1
42-
- uses: dev-proxy-tools/actions/record-start@v1
43-
- run: pnpm install --frozen-lockfile
44-
- run: pnpm build:cli
45-
- run: pnpm install:ffmpeg
46-
- run: pnpm ollama:start
47-
- run: pnpm whisper:start
48-
- run: pnpm test:ci --model ollama:llama3.2:1b --out ./temp/summarize-ollama-phi3
49-
- name: run convert-ollama-phi3
50-
run: pnpm cli convert summarize --model ollama:llama3.2:1b "samples/sample/src/rag/*.md" --cache-name sum
51-
- name: run transcribe
52-
run: pnpm run:script video-transcript --model ollama:llama3.2:1b --out ./temp/summarize-ollama-phi3 --out-output $GITHUB_STEP_SUMMARY
53-
- run: cat devproxy.log
54-
if: always()
26+
tests:
27+
runs-on: ubuntu-latest
28+
env:
29+
OLLAMA_HOST: "http://localhost:11434"
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
submodules: "recursive"
34+
fetch-depth: 0
35+
- uses: pnpm/action-setup@v4
36+
- uses: actions/setup-node@v4
37+
with:
38+
node-version: "22"
39+
cache: pnpm
40+
- uses: dev-proxy-tools/actions/install@v1
41+
- uses: dev-proxy-tools/actions/start@v1
42+
- uses: dev-proxy-tools/actions/record-start@v1
43+
- run: cat ./devproxyrc.json
44+
- run: pnpm install --frozen-lockfile
45+
- run: pnpm build:cli
46+
- run: pnpm install:ffmpeg
47+
- run: pnpm ollama:start
48+
- run: pnpm whisper:start
49+
- run: pnpm test:ci --model ollama:llama3.2:1b --out ./temp/summarize-ollama-phi3
50+
- name: run convert-ollama-phi3
51+
run: pnpm cli convert summarize --model ollama:llama3.2:1b "samples/sample/src/rag/*.md" --cache-name sum
52+
- name: run transcribe
53+
run: pnpm run:script video-transcript --model ollama:llama3.2:1b --out ./temp/summarize-ollama-phi3 --out-output $GITHUB_STEP_SUMMARY
54+
- run: cat devproxy.log
55+
if: always()

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
"devcli",
8484
"devcontainers",
8585
"devproxy",
86+
"devproxyrc",
8687
"dfence",
8788
"docify",
8889
"Dockerized",

0 commit comments

Comments
 (0)