File tree Expand file tree Collapse file tree 2 files changed +12
-12
lines changed
Expand file tree Collapse file tree 2 files changed +12
-12
lines changed Original file line number Diff line number Diff line change 4343 name : isim
4444 make : PLATFORM=isim
4545
46- defaults :
47- run :
48- shell : ${{ matrix.os == 'windows-latest' && 'msys2 {0}' || 'bash' }}
4946 env :
5047 MAKEFLAGS : -j 8
5148
@@ -59,16 +56,19 @@ jobs:
5956 msystem : mingw64
6057 install : >-
6158 mingw-w64-x86_64-cc
62- mingw-w64-x86_64-autotools make
59+ make
60+
61+ - name : windows build curl
62+ if : matrix.os == 'windows-latest'
63+ run : make curl/windows/libcurl.a
64+ shell : msys2 {0}
6365
6466 - name : build sqlite-sync
6567 run : make ${{ matrix.make && matrix.make || ''}}
66- shell : bash
6768
6869 - name : windows install sqlite3
6970 if : matrix.os == 'windows-latest'
7071 run : choco install sqlite -y
71- shell : bash
7272
7373 - name : macos install sqlite3 without SQLITE_OMIT_LOAD_EXTENSION
7474 if : matrix.name == 'macos'
@@ -117,7 +117,6 @@ jobs:
117117 - name : test sqlite-sync
118118 if : matrix.name == 'linux' || matrix.name == 'windows'
119119 run : make test
120- shell : bash
121120
122121 - name : test sqlite-sync + coverage
123122 if : matrix.name == 'macos'
Original file line number Diff line number Diff line change @@ -191,7 +191,12 @@ $(CURL_LIB):
191191endif
192192 mkdir -p $(CURL_DIR)/src
193193 curl -L -o $(CURL_DIR)/src/curl.zip "https://github.com/curl/curl/releases/download/curl-$(subst .,_,${CURL_VERSION})/curl-$(CURL_VERSION).zip"
194+
195+ ifeq ($(HOST),windows)
196+ powershell -Command "Expand-Archive -Path '$(CURL_DIR)\src\curl.zip' -DestinationPath '$(CURL_DIR)\src\'"
197+ else
194198 unzip $(CURL_DIR)/src/curl.zip -d $(CURL_DIR)/src/.
199+ endif
195200
196201 cd $(CURL_SRC) && ./configure \
197202 --without-libpsl \
@@ -260,19 +265,15 @@ endif
260265 # --without-zsh-functions-dir \
261266 # --without-libgsasl \
262267
263- ifeq ($(PLATFORM),windows)
264- cd $(CURL_SRC) && /c/mingw64/bin/make.exe
265- else
266268 cd $(CURL_SRC) && make
267- endif
268269
269270 mkdir -p $(CURL_DIR)/$(PLATFORM)
270271 mv $(CURL_SRC)/lib/.libs/libcurl.a $(CURL_DIR)/$(PLATFORM)
271272 rm -rf $(CURL_DIR)/src
272273
273274# Clean up generated files
274275clean :
275- rm -rf $(BUILD_DIRS ) $(DIST_DIR ) /* $(COV_DIR ) * .gcda * .gcno * .gcov
276+ rm -rf $(BUILD_DIRS ) $(DIST_DIR ) /* $(COV_DIR ) * .gcda * .gcno * .gcov $( CURL_DIR ) /src
276277
277278# Help message
278279help :
You can’t perform that action at this time.
0 commit comments