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:
nhmall
2022-01-30 14:27:44 -05:00
parent 87d58c1c83
commit e86b926e54

View File

@@ -137,26 +137,30 @@ steps:
export ADD_CURSES=Y
export PDCURSES_TOP=../submodules/pdcurses
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 CURLDST=mingw-x64.zip
#export MINGWBIN=mingw64
#export MSYSTEM=MINGW64
#
#32-bit
# 32-bit
export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/11.2.0-9.0.0-ucrt-r4/winlibs-i686-posix-dwarf-gcc-11.2.0-mingw-w64ucrt-9.0.0-r4.zip
export CURLDST=mingw-x86.zip
export MINGWBIN=mingw32
export MSYSTEM=MINGW32
#all
# all
mkdir -p ../lib
cd ../lib
mkdir -p mingw
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
cd ../src
pwd
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 depend