Skip to content

Commit c1531b9

Browse files
Merge pull request #518 from janhq/update-dev-from-master-2026-05-17-01-10
Sync master with upstream release b9190
2 parents 968819d + b64739e commit c1531b9

720 files changed

Lines changed: 4219 additions & 1322 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ insert_final_newline = unset
4545
trim_trailing_whitespace = unset
4646
insert_final_newline = unset
4747

48-
[tools/server/webui/**]
48+
[tools/ui/**]
4949
indent_style = unset
5050
indent_size = unset
5151
end_of_line = unset

.github/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ android:
7373
- changed-files:
7474
- any-glob-to-any-file:
7575
- examples/llama.android/**
76-
server/webui:
76+
server/ui:
7777
- changed-files:
7878
- any-glob-to-any-file:
79-
- tools/server/webui/**
79+
- tools/ui/**
8080
server:
8181
- changed-files:
8282
- any-glob-to-any-file:

.github/workflows/build-self-hosted.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ jobs:
6868
- name: Determine tag name
6969
id: tag
7070
uses: ./.github/actions/get-tag-name
71+
env:
72+
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
7173

7274
ggml-ci-nvidia-cuda:
7375
needs: determine-tag
@@ -81,7 +83,7 @@ jobs:
8183
- name: Test
8284
id: ggml-ci
8385
env:
84-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
86+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
8587
run: |
8688
nvidia-smi
8789
GG_BUILD_CUDA=1 bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
@@ -98,7 +100,7 @@ jobs:
98100
- name: Test
99101
id: ggml-ci
100102
env:
101-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
103+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
102104
run: |
103105
vulkaninfo --summary
104106
GG_BUILD_VULKAN=1 GGML_VK_DISABLE_COOPMAT2=1 bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
@@ -115,7 +117,7 @@ jobs:
115117
- name: Test
116118
id: ggml-ci
117119
env:
118-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
120+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
119121
run: |
120122
vulkaninfo --summary
121123
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp /mnt/llama.cpp
@@ -205,7 +207,7 @@ jobs:
205207
- name: Test
206208
id: ggml-ci
207209
env:
208-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
210+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
209211
run: |
210212
GG_BUILD_METAL=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
211213
@@ -234,7 +236,7 @@ jobs:
234236
- name: Test
235237
id: ggml-ci
236238
env:
237-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
239+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
238240
run: |
239241
GG_BUILD_WEBGPU=1 GG_BUILD_WEBGPU_DAWN_PREFIX="$GITHUB_WORKSPACE/dawn" \
240242
bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
@@ -251,7 +253,7 @@ jobs:
251253
- name: Test
252254
id: ggml-ci
253255
env:
254-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
256+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
255257
run: |
256258
vulkaninfo --summary
257259
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
@@ -270,7 +272,7 @@ jobs:
270272
- name: Test
271273
id: ggml-ci
272274
env:
273-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
275+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
274276
run: |
275277
vulkaninfo --summary
276278
GG_BUILD_VULKAN=1 bash ./ci/run.sh ~/results/llama.cpp ~/mnt/llama.cpp
@@ -291,7 +293,7 @@ jobs:
291293
MSYSTEM: UCRT64
292294
CHERE_INVOKING: 1
293295
PATH: C:\msys64\ucrt64\bin;C:\msys64\usr\bin;C:\Windows\System32;${{ env.PATH }}
294-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
296+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
295297
run: |
296298
vulkaninfo --summary
297299
# Skip python related tests with GG_BUILD_LOW_PERF=1 since Windows MSYS2 UCRT64 currently fails to create
@@ -332,7 +334,7 @@ jobs:
332334
- name: Test
333335
id: ggml-ci
334336
env:
335-
HF_WEBUI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
337+
HF_UI_VERSION: ${{ needs.determine-tag.outputs.tag_name }}
336338
run: |
337339
source ./openvino_toolkit/setupvars.sh
338340
GG_BUILD_OPENVINO=1 GGML_OPENVINO_DEVICE=GPU GG_BUILD_LOW_PERF=1 bash ./ci/run.sh ./tmp/results ./tmp/mnt

0 commit comments

Comments
 (0)