Refactor GitHub Actions and Makefile for Windows builds; streamline conditions and improve command execution

Author: Gioee

.github/workflows/main.yml

@@ -269,12 +269,8 @@ jobs:
         with:
           submodules: ${{ !contains(matrix.make, 'OMIT_LOCAL_ENGINE=1') && 'true' || 'false' }}
 
-      - name: windows install sqlite
-        if: matrix.name == 'windows'
-        run: choco install sqlite -y
-
       - uses: msys2/setup-msys2@v2.27.0
-        if: matrix.name == 'windows' && matrix.variant != 'remote'
+        if: matrix.name == 'windows'
         with:
           msystem: mingw64
           install: >-
@@ -318,12 +314,8 @@ jobs:
         if: matrix.name == 'android-aar'
         run: make ${{ matrix.make }}
 
-      - name: windows build sqlite-memory (remote)
-        if: matrix.name == 'windows' && matrix.variant == 'remote'
-        run: make extension ${{ matrix.make && matrix.make || ''}}
-
-      - name: windows build sqlite-memory (llama.cpp)
-        if: matrix.name == 'windows' && matrix.variant != 'remote'
+      - name: windows build sqlite-memory
+        if: matrix.name == 'windows'
         shell: msys2 {0}
         run: make extension ${{ matrix.make && matrix.make || ''}}
 
@@ -410,12 +402,8 @@ jobs:
         if: matrix.skip_test != true && matrix.os != 'windows-2022' && matrix.name != 'android'
         run: ${{ matrix.name == 'linux-musl' && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}}
 
-      - name: windows test sqlite-memory (remote)
-        if: matrix.skip_test != true && matrix.name == 'windows' && matrix.variant == 'remote'
-        run: make test ${{ matrix.make && matrix.make || ''}}
-
-      - name: windows test sqlite-memory (llama.cpp)
-        if: matrix.skip_test != true && matrix.name == 'windows' && matrix.variant != 'remote'
+      - name: windows test sqlite-memory
+        if: matrix.skip_test != true && matrix.name == 'windows'
         shell: msys2 {0}
         run: make test ${{ matrix.make && matrix.make || ''}}
 

Makefile

@@ -456,29 +456,29 @@ endef
 
 .PHONY: xcframework
 xcframework:
-	# Build remote variant (no llama.cpp)
-	$(MAKE) distclean && $(MAKE) PLATFORM=ios OMIT_LOCAL_ENGINE=1
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_remote.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=ios-sim OMIT_LOCAL_ENGINE=1
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_remote.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=macos OMIT_LOCAL_ENGINE=1
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_remote.dylib
+	@# Build remote variant (no llama.cpp)
+	$(MAKE) -j1 distclean && $(MAKE) PLATFORM=ios OMIT_LOCAL_ENGINE=1 && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_remote.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=ios-sim OMIT_LOCAL_ENGINE=1 && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_remote.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=macos OMIT_LOCAL_ENGINE=1 && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_remote.dylib
 	$(call create_xcframework,_remote,memory-remote)
-	# Build local variant (llama.cpp only)
-	$(MAKE) distclean && $(MAKE) PLATFORM=ios OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_local.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=ios-sim OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_local.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=macos OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_local.dylib
+	@# Build local variant (llama.cpp only)
+	$(MAKE) -j1 distclean && $(MAKE) PLATFORM=ios OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_local.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=ios-sim OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_local.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=macos OMIT_REMOTE_ENGINE=1 $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_local.dylib
 	$(call create_xcframework,_local,memory-local)
-	# Build full variant (both)
-	$(MAKE) distclean && $(MAKE) PLATFORM=ios $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_full.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=ios-sim $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_full.dylib
-	$(MAKE) clean && $(MAKE) PLATFORM=macos $(XCFRAMEWORK_LLAMA)
-	mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_full.dylib
+	@# Build full variant (both)
+	$(MAKE) -j1 distclean && $(MAKE) PLATFORM=ios $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios_full.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=ios-sim $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/ios-sim_full.dylib && \
+		$(MAKE) -j1 clean && $(MAKE) PLATFORM=macos $(XCFRAMEWORK_LLAMA) && \
+		mv $(DIST_DIR)/memory.dylib $(DIST_DIR)/macos_full.dylib
 	$(call create_xcframework,_full,memory-full)
 
 # ============ Android AAR ============