Skip to content

Commit e71ad40

Browse files
author
Daniele Briggi
committed
fix(windows): missing git
1 parent 794315b commit e71ad40

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ jobs:
1919
arch: x86_64
2020
name: linux-vulkan
2121
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON"
22-
- os: LinuxARM64
23-
arch: arm64
24-
name: linux-vulkan
25-
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_VULKAN=ON"
2622
- os: macos-latest
2723
name: macos
2824
- os: windows-latest
@@ -86,6 +82,12 @@ jobs:
8682
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
8783
echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV
8884
85+
- name: windows install dependencies
86+
if: matrix.os == 'windows-latest'
87+
run: |
88+
pacman -S --noconfirm git
89+
shell: msys2 {0}
90+
8991
- name: windows build sqlite-ai
9092
if: matrix.name == 'windows'
9193
run: make extension ${{ matrix.make && matrix.make || ''}}
@@ -95,14 +97,14 @@ jobs:
9597
if: matrix.name != 'windows'
9698
run: make extension ${{ matrix.make && matrix.make || ''}}
9799

98-
- name: windows install sqlite3
99-
if: matrix.os == 'windows-latest'
100-
run: choco install sqlite -y
101-
102100
- name: macos install sqlite3 without SQLITE_OMIT_LOAD_EXTENSION
103101
if: matrix.name == 'macos'
104102
run: brew link sqlite --force
105103

104+
- name: windows install sqlite3
105+
if: matrix.os == 'windows-latest'
106+
run: choco install -y --no-progress sqlite
107+
106108
- name: android setup test environment
107109
if: matrix.name == 'android' && matrix.arch != 'arm64-v8a'
108110
run: |

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ WHISPER_LIBS = $(BUILD_WHISPER)/src/libwhisper.a
5151
# Platform-specific settings
5252
ifeq ($(PLATFORM),windows)
5353
TARGET := $(DIST_DIR)/ai.dll
54-
LDFLAGS += -shared
54+
LDFLAGS = -L./$(BUILD_LLAMA)/common -L./$(BUILD_LLAMA)/ggml/src -L./$(BUILD_LLAMA)/src -L./$(BUILD_WHISPER)/src -l:libcommon.a -l:ggml.a -l:ggml-cpu.a -l:ggml-base.a -l:libllama.a -l:libwhisper.a -shared
5555
# Create .def file for Windows
5656
DEF_FILE := $(BUILD_DIR)/ai.def
5757
STRIP = strip --strip-unneeded $@

0 commit comments

Comments
 (0)