Skip to content

Commit ba324b0

Browse files
committed
Merge branch 'master' into dev-refactoring
2 parents 34d9b38 + fef0cbe commit ba324b0

File tree

161 files changed

+15065
-5162
lines changed

Some content is hidden

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

161 files changed

+15065
-5162
lines changed

.github/workflows/build.yml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
push:
1111
branches:
1212
- master
13-
paths: ['.github/workflows/build.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.cuh', '**/*.swift', '**/*.m', '**/*.metal']
13+
paths: ['.github/workflows/build.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.cuh', '**/*.swift', '**/*.m', '**/*.metal', '**/*.comp']
1414
pull_request:
1515
types: [opened, synchronize, reopened]
16-
paths: ['.github/workflows/build.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.cuh', '**/*.swift', '**/*.m', '**/*.metal']
16+
paths: ['.github/workflows/build.yml', '**/CMakeLists.txt', '**/Makefile', '**/*.h', '**/*.hpp', '**/*.c', '**/*.cpp', '**/*.cu', '**/*.cuh', '**/*.swift', '**/*.m', '**/*.metal', '**/*.comp']
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
@@ -302,6 +302,36 @@ jobs:
302302
cd build
303303
ctest -L main --verbose --timeout 900
304304
305+
ubuntu-latest-llguidance:
306+
runs-on: ubuntu-latest
307+
308+
steps:
309+
- name: Clone
310+
id: checkout
311+
uses: actions/checkout@v4
312+
313+
- name: Dependencies
314+
id: depends
315+
run: |
316+
sudo apt-get update
317+
sudo apt-get install build-essential
318+
319+
- name: Build
320+
id: cmake_build
321+
run: |
322+
mkdir build
323+
cd build
324+
cmake .. \
325+
-DLLAMA_FATAL_WARNINGS=ON \
326+
-DLLAMA_LLGUIDANCE=ON
327+
cmake --build . --config Release -j $(nproc)
328+
329+
- name: Test
330+
id: cmake_test
331+
run: |
332+
cd build
333+
ctest -L main --verbose --timeout 900
334+
305335
ubuntu-latest-cmake-rpc:
306336
runs-on: ubuntu-latest
307337

@@ -1154,7 +1184,6 @@ jobs:
11541184
uses: hendrikmuhs/[email protected]
11551185
with:
11561186
key: ${{ github.job }}
1157-
variant: sccache
11581187
evict-old-files: 1d
11591188

11601189
- name: Build
@@ -1189,7 +1218,6 @@ jobs:
11891218
uses: hendrikmuhs/[email protected]
11901219
with:
11911220
key: windows-latest-cmake-hip-release
1192-
variant: sccache
11931221
evict-old-files: 1d
11941222

11951223
- name: Install

.github/workflows/close-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/stale@v5
1919
with:
20-
exempt-issue-labels: "refactor,help wanted,good first issue,research,bug"
20+
exempt-issue-labels: "refactor,help wanted,good first issue,research,bug,roadmap"
2121
days-before-issue-stale: 30
2222
days-before-issue-close: 14
2323
stale-issue-label: "stale"

.github/workflows/server.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,36 @@ jobs:
8181
with:
8282
node-version: '22.11.0'
8383

84+
- name: WebUI - Install dependencies
85+
id: webui_lint
86+
run: |
87+
cd examples/server/webui
88+
npm ci
89+
90+
- name: WebUI - Check code format
91+
id: webui_format
92+
run: |
93+
git config --global --add safe.directory $(realpath .)
94+
cd examples/server/webui
95+
git status
96+
97+
npm run format
98+
git status
99+
modified_files="$(git status -s)"
100+
echo "Modified files: ${modified_files}"
101+
if [ -n "${modified_files}" ]; then
102+
echo "Files do not follow coding style. To fix: npm run format"
103+
echo "${modified_files}"
104+
exit 1
105+
fi
106+
84107
- name: Verify bundled index.html
85108
id: verify_server_index_html
86109
run: |
87110
git config --global --add safe.directory $(realpath .)
88111
cd examples/server/webui
89112
git status
90-
npm ci
113+
91114
npm run build
92115
git status
93116
modified_files="$(git status -s)"

0 commit comments

Comments
 (0)