Skip to content

Commit 2f64bd8

Browse files
committed
revert(workflow): no windows
1 parent 42ac59e commit 2f64bd8

File tree

1 file changed

+32
-50
lines changed

1 file changed

+32
-50
lines changed

.github/workflows/main.yml

Lines changed: 32 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,29 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
- name: linux-vulkan
19-
os: ubuntu-latest
18+
- os: ubuntu-latest
2019
arch: x86_64
20+
name: linux-vulkan
2121
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU_ALL_VARIANTS=ON -DGGML_VULKAN=ON"
22-
- name: macos
23-
os: macos-latest
24-
- name: windows
25-
os: windows-latest
26-
arch: x86_64
27-
- name: windows-cuda
28-
os: windows-latest
29-
arch: x86_64
30-
make: LLAMA="-DGGML_BACKEND_DL=ON -DGGML_NATIVE=OFF -DGGML_CPU=OFF -DGGML_CUDA=ON"
31-
- name: android
32-
os: ubuntu-latest
22+
- os: macos-latest
23+
name: macos
24+
# - os: windows-latest
25+
# arch: x86_64
26+
# name: windows
27+
- os: ubuntu-latest
3328
arch: arm64-v8a
29+
name: android
3430
make: PLATFORM=android ARCH=arm64-v8a
35-
- name: android
36-
os: ubuntu-latest
31+
- os: ubuntu-latest
3732
arch: x86_64
33+
name: android
3834
make: PLATFORM=android ARCH=x86_64
3935
sqlite-amalgamation-zip: https://sqlite.org/2025/sqlite-amalgamation-3490100.zip
40-
- name: ios
41-
os: macos-latest
36+
- os: macos-latest
37+
name: ios
4238
make: PLATFORM=ios
43-
- name: isim
44-
os: macos-latest
39+
- os: macos-latest
40+
name: isim
4541
make: PLATFORM=isim
4642

4743
defaults:
@@ -54,11 +50,14 @@ jobs:
5450
with:
5551
submodules: true
5652

57-
- name: linux install dependencies
58-
if: matrix.name == 'linux-vulkan'
59-
run: |
60-
sudo apt-get update -y
61-
sudo apt-get install -y build-essential wget git cmake sqlite3 libcurl4-openssl-dev
53+
- uses: msys2/[email protected]
54+
if: matrix.os == 'windows-latest'
55+
with:
56+
msystem: mingw64
57+
install: >-
58+
mingw-w64-x86_64-cc
59+
mingw-w64-x86_64-cmake
60+
make
6261
6362
- name: linux install vulkan
6463
if: matrix.name == 'linux-vulkan'
@@ -77,28 +76,19 @@ jobs:
7776
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
7877
echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV
7978
79+
- name: windows build sqlite-ai
80+
if: matrix.name == 'windows'
81+
run: make extension ${{ matrix.make && matrix.make || ''}}
82+
shell: msys2 {0}
8083

81-
- name: Install CUDA Toolkit
82-
if: matrix.name == 'windows-cuda'
83-
run: |
84-
choco install cuda -y --no-progress
85-
shell: powershell
86-
87-
- name: Setup MSBuild
88-
if: matrix.name == 'windows' || matrix.name == 'windows-cuda'
89-
uses: microsoft/setup-msbuild@v2
90-
91-
- name: Windows build sqlite-ai
92-
if: matrix.name == 'windows' || matrix.name == 'windows-cuda'
93-
shell: cmd
94-
run: |
95-
call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvars64.bat"
96-
nmake /f Makefile PLATFORM=windows ${{ matrix.make && matrix.make || ''}}
97-
9884
- name: build sqlite-ai
9985
if: matrix.name != 'windows'
10086
run: make extension ${{ matrix.make && matrix.make || ''}}
10187

88+
- name: windows install sqlite3
89+
if: matrix.os == 'windows-latest'
90+
run: choco install sqlite -y
91+
10292
- name: macos install sqlite3 without SQLITE_OMIT_LOAD_EXTENSION
10393
if: matrix.name == 'macos'
10494
run: brew link sqlite --force
@@ -145,16 +135,8 @@ jobs:
145135
adb push ${{ github.workspace }}/. /data/local/tmp/
146136
adb shell "sh /data/local/tmp/commands.sh"
147137
148-
149-
- name: windows test sqlite-ai
150-
if: matrix.os == 'windows-latest'
151-
run: |
152-
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
153-
nmake /f Makefile test PLATFORM=windows
154-
shell: cmd
155-
156138
- name: test sqlite-ai
157-
if: matrix.name == 'linux' || matrix.name == 'macos'
139+
if: matrix.name == 'linux' || matrix.name == 'windows' || matrix.name == 'macos'
158140
run: make test
159141

160142
- uses: actions/[email protected]

0 commit comments

Comments
 (0)