Skip to content

Commit b483ad2

Browse files
committed
ci: fix issues
1 parent 14d15d8 commit b483ad2

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
2727
- name: Configure and build
2828
run: |
29-
cmake -G Ninja . -B build
29+
cmake . -B build -G Ninja -D VISP_FMT_LIB=ON
3030
cmake --build build --config Release
3131
3232
- name: Run tests
@@ -51,7 +51,7 @@ jobs:
5151
5252
- name: Configure and build with Vulkan
5353
run: |
54-
cmake -G Ninja . -B build -D VISP_VULKAN=ON
54+
cmake . -B build -G Ninja -D VISP_VULKAN=ON -D VISP_FMT_LIB=ON
5555
cmake --build build --config Release
5656
5757
- name: Run tests
@@ -67,17 +67,20 @@ jobs:
6767
with:
6868
submodules: recursive
6969

70+
- name: Setup MSVC
71+
uses: microsoft/setup-msbuild@v2
72+
7073
- name: Configure and build
7174
run: |
72-
cmake -G Ninja . -B build
75+
cmake . -B build -G Ninja
7376
cmake --build build --config Release
7477
7578
- name: Run tests
7679
run: ctest build -C Release
7780

7881
build-test-macos:
7982
name: Build & Test on macOS (CPU only)
80-
runs-on: macos-latest
83+
runs-on: macos-14
8184

8285
steps:
8386
- name: Checkout code
@@ -86,11 +89,11 @@ jobs:
8689
submodules: recursive
8790

8891
- name: Install dependencies
89-
run: brew install cmake ninja
92+
run: brew install cmake
9093

9194
- name: Configure and build
9295
run: |
93-
cmake -G Ninja . -B build
96+
cmake -G Ninja . -B build -D GGML_METAL=OFF -D GGML_RPC=ON -D CMAKE_BUILD_RPATH="@loader_path"
9497
cmake --build build --config Release
9598
9699
- name: Run tests

depend/ggml

0 commit comments

Comments
 (0)