more CI mingw tinkering
The default tar in the path withing the CI environment is not the bsdtar variation of tar that comes with Windows (the one which will extract zip files as well as tar files). Try using powershell instead for the extraction instead.
This commit is contained in:
+7
-3
@@ -137,8 +137,6 @@ steps:
|
|||||||
export ADD_CURSES=Y
|
export ADD_CURSES=Y
|
||||||
export PDCURSES_TOP=../submodules/pdcurses
|
export PDCURSES_TOP=../submodules/pdcurses
|
||||||
export LUA_VERSION=5.4.4
|
export LUA_VERSION=5.4.4
|
||||||
cd ../lib
|
|
||||||
mkdir mingw
|
|
||||||
#
|
#
|
||||||
# 64-bit
|
# 64-bit
|
||||||
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r4/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64ucrt-9.0.0-r4.zip
|
#export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r4/winlibs-x86_64-posix-seh-gcc-11.2.0-mingw-w64ucrt-9.0.0-r4.zip
|
||||||
@@ -152,11 +150,17 @@ steps:
|
|||||||
export MINGWBIN=mingw32
|
export MINGWBIN=mingw32
|
||||||
export MSYSTEM=MINGW32
|
export MSYSTEM=MINGW32
|
||||||
# all
|
# all
|
||||||
|
mkdir -p ../lib
|
||||||
|
cd ../lib
|
||||||
|
mkdir -p mingw
|
||||||
curl -L $CURLSRC -o $CURLDST
|
curl -L $CURLSRC -o $CURLDST
|
||||||
tar -C mingw -xvf $CURLDST
|
#tar -C mingw -xvf $CURLDST
|
||||||
|
#/c/Windows/System32/tar -C mingw -xvf $CURLDST
|
||||||
|
powershell -command "Expand-Archive -Force $CURLDST mingw"
|
||||||
export PATH=../lib/mingw/$MINGWBIN/bin:$PATH
|
export PATH=../lib/mingw/$MINGWBIN/bin:$PATH
|
||||||
export
|
export
|
||||||
cd ../src
|
cd ../src
|
||||||
|
pwd
|
||||||
cp ../sys/windows/Makefile.mingw32* .
|
cp ../sys/windows/Makefile.mingw32* .
|
||||||
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION clean
|
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION clean
|
||||||
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION depend
|
mingw32-make -f Makefile.mingw32 CI_COMPILER=1 MSYSTEM=$MSYSTEM LUA_VERSION=$LUA_VERSION depend
|
||||||
|
|||||||
Reference in New Issue
Block a user