Bump OpenSSL and pthreads links. Add release and debug configuration.
Build and add Windows installer to generated artifacts. Co-authored-by: Yonggang Luo <[email protected]> Signed-off-by: Yonggang Luo <[email protected]> Signed-off-by: Alin Gabriel Serdean <[email protected]> --- appveyor.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fa6754ce2..a51a962c3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,9 @@ version: 1.0.{build} branches: only: - master +configuration: + - Debug + - Release clone_folder: C:\openvswitch init: - ps: $env:PATH ="C:\Python37;"+$env:PATH @@ -11,15 +14,15 @@ init: mkdir C:\ovs-build-downloads - $source = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip"; + $source = "https://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip"; $destination = "C:\pthreads-win32\pthreads-win32.zip" Invoke-WebRequest $source -OutFile $destination - $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2t.exe"; + $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2u.exe"; - $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2t.exe" + $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2u.exe" Invoke-WebRequest $source -OutFile $destination @@ -29,7 +32,7 @@ init: cd C:\ovs-build-downloads - .\Win32OpenSSL-1_0_2t.exe /silent /verysilent /sp- /suppressmsgboxes + .\Win32OpenSSL-1_0_2u.exe /silent /verysilent /sp- /suppressmsgboxes Start-Sleep -s 30 @@ -43,6 +46,12 @@ build_script: - C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/dll/x86/*.dll /c/openvswitch/." - C:\MinGW\msys\1.0\bin\bash -lc "mv /bin/link.exe /bin/link_copy.exe" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./boot.sh" -- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=C:/pthreads-win32/Pre-built.2 --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --with-pthread=C:/pthreads-win32/Pre-built.2 --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"%CONFIGURATION%\" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make" - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make datapath_windows_analyze" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch && make windows_installer" +- copy c:\openvswitch\windows\ovs-windows-installer\bin\Release\OpenvSwitch.msi OpenvSwitch-%CONFIGURATION%.msi + +artifacts: + - path: OpenvSwitch-%CONFIGURATION%.msi + name: openvswitch_installer -- 2.27.0.windows.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
