mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-01-11 09:17:51 +00:00
[appveyor] add build fix (#1520)
Add fix due to msys2/MSYS2-packages#1967
This commit is contained in:
parent
46ee427ee3
commit
78640532e1
33
appveyor.yml
33
appveyor.yml
@ -14,34 +14,25 @@ environment:
|
||||
CHERE_INVOKING: enabled_from_arguments
|
||||
matrix:
|
||||
- MSYSTEM: MINGW64
|
||||
MSYS_PACKAGES: mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc
|
||||
MSYS_BITNESS: 64
|
||||
- MSYSTEM: MINGW32
|
||||
MSYS_PACKAGES: mingw-w64-i686-boost mingw-w64-i686-miniupnpc
|
||||
MSYS_BITNESS: 32
|
||||
|
||||
install:
|
||||
- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Rns gcc-fortran gcc mingw-w64-{i686,x86_64}-gcc-ada mingw-w64-{i686,x86_64}-gcc-objc"
|
||||
# TODO: revert that change when appveyor's images will be updated
|
||||
- c:\msys64\usr\bin\bash -l "build/appveyor-msys2-upgrade.bash"
|
||||
# update runtime
|
||||
- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
|
||||
|
||||
- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
|
||||
|
||||
- if "%MSYSTEM%" == "MINGW64" (
|
||||
c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc"
|
||||
) else (
|
||||
c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-boost mingw-w64-i686-miniupnpc"
|
||||
)
|
||||
|
||||
- if "%MSYSTEM%" == "MINGW64" (
|
||||
set "bitness=64"
|
||||
) else (
|
||||
set "bitness=32"
|
||||
)
|
||||
# update packages and install required
|
||||
- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu ${MSYS_PACKAGES}"
|
||||
|
||||
build_script:
|
||||
- cmd: >-
|
||||
cd \projects\i2pd
|
||||
|
||||
echo MSYSTEM = %MSYSTEM%, bitness = %bitness%
|
||||
|
||||
- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j2"
|
||||
- 7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe
|
||||
- echo MSYSTEM = %MSYSTEM%, bitness = %MSYS_BITNESS%
|
||||
- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j3"
|
||||
- 7z a -tzip -mx9 -mmt i2pd-mingw-win%MSYS_BITNESS%.zip i2pd.exe
|
||||
|
||||
test: off
|
||||
|
||||
|
10
build/appveyor-msys2-upgrade.bash
Normal file
10
build/appveyor-msys2-upgrade.bash
Normal file
@ -0,0 +1,10 @@
|
||||
set -e -x
|
||||
|
||||
base_url='http://repo.msys2.org/msys/x86_64/'
|
||||
packages="libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz zstd-1.4.4-2-x86_64.pkg.tar.xz"
|
||||
for p in $packages
|
||||
do
|
||||
curl "${base_url}$p" -o "$p"
|
||||
done
|
||||
pacman -U --noconfirm $packages
|
||||
rm -f $packages
|
Loading…
Reference in New Issue
Block a user