From patchwork Mon Sep 21 01:32:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin Serdean X-Patchwork-Id: 1368023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cloudbasesolutions.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bvn5C3PM9z9sTQ for ; Mon, 21 Sep 2020 11:33:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8EA785FD6; Mon, 21 Sep 2020 01:33:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7WpZmqqVzPo9; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5F78385FEB; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3AE24C0895; Mon, 21 Sep 2020 01:33:14 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id A0953C0890 for ; Mon, 21 Sep 2020 01:33:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8FA1D204B0 for ; Mon, 21 Sep 2020 01:33:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDfpGf48cDVF for ; Mon, 21 Sep 2020 01:33:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by silver.osuosl.org (Postfix) with ESMTPS id AD3351FD7D for ; Mon, 21 Sep 2020 01:33:04 +0000 (UTC) X-Originating-IP: 89.137.184.67 Received: from localhost.localdomain (unknown [89.137.184.67]) (Authenticated sender: aserdean@ovn.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 564BEC000A; Mon, 21 Sep 2020 01:33:02 +0000 (UTC) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 21 Sep 2020 04:32:41 +0300 Message-Id: <20200921013241.654-8-aserdean@cloudbasesolutions.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200921013241.654-1-aserdean@cloudbasesolutions.com> References: <20200921013241.654-1-aserdean@cloudbasesolutions.com> MIME-Version: 1.0 Cc: Yonggang Luo , Jinjun Gao Subject: [ovs-dev] [PATCH v2 8/8] appveyor: Bump outdated links and add artifacts X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Bump OpenSSL. Add release and debug configuration. Build and add Windows installer to generated artifacts. Build and zip prebuilt version. Co-authored-by: Yonggang Luo Signed-off-by: Yonggang Luo Co-authored-by: Jinjun Gao Signed-off-by: Jinjun Gao Signed-off-by: Alin Gabriel Serdean --- appveyor.yml | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6e2b2e9e2..25c3f69fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,26 +3,27 @@ image: Visual Studio 2019 branches: only: - master -clone_folder: C:\openvswitch +configuration: + - Debug + - Release +clone_folder: C:\openvswitch_compile init: - ps: $env:PATH ="C:\Python37;"+$env:PATH - ps: New-Item -Type HardLink -Path "C:\Python37\python3.exe" -Value "C:\Python37\python.exe" - ps: >- mkdir C:\ovs-build-downloads - $source = "https://slproweb.com/download/Win32OpenSSL-1_0_2t.exe" + mkdir C:\openvswitch\driver - $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2t.exe" + $source = "https://slproweb.com/download/Win64OpenSSL-1_0_2u.exe" - Invoke-WebRequest $source -OutFile $destination - - cd C:\pthreads-win32 + $destination = "C:\ovs-build-downloads\Win64OpenSSL-1_0_2u.exe" - 7z x C:\pthreads-win32\pthreads-win32.zip + Invoke-WebRequest $source -OutFile $destination cd C:\ovs-build-downloads - .\Win32OpenSSL-1_0_2t.exe /silent /verysilent /sp- /suppressmsgboxes + .\Win64OpenSSL-1_0_2u.exe /silent /verysilent /sp- /suppressmsgboxes Start-Sleep -s 30 @@ -32,13 +33,28 @@ init: python3 -m pip install pypiwin32 --disable-pip-version-check + cd C:\openvswitch_compile + build_script: - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"' - C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab" - C:\MinGW\msys\1.0\bin\bash -lc "mv /bin/link.exe /bin/link_copy.exe" # Build pthreads - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/pthreads4w-code && nmake all install" -- 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-BUILT/ --with-openssl=C:/OpenSSL-Win32 --with-vstudiotarget=\"Debug\" -- 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_compile && ./boot.sh" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && ./configure CC=build-aux/cccl LD=\"`which link`\" LIBS=\"-lws2_32 -lShlwapi -liphlpapi -lwbemuuid -lole32 -loleaut32\" --prefix=C:/openvswitch/usr --localstatedir=C:/openvswitch/var --sysconfdir=C:/openvswitch/etc --with-pthread=c:/PTHREADS-BUILT/ --enable-ssl --with-openssl=C:/OpenSSL-Win64 --with-vstudiotarget=\"%CONFIGURATION%\"" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make -j 4" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make datapath_windows_analyze" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make install" +- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make windows_installer" +- cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\bin +- cp C:\PTHREADS-BUILT\bin\pthreadVC3.dll C:\openvswitch\usr\sbin +- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package\* C:\openvswitch\driver +- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package.cer C:\openvswitch\driver +- ps: cp C:\openvswitch_compile\datapath-windows\misc\* C:\openvswitch\driver +- cp c:\openvswitch_compile\windows\ovs-windows-installer\bin\x64\Release\OpenvSwitch.msi c:\OpenvSwitch-%CONFIGURATION%.msi + +after_build: + - ps: 7z a C:\ovs-master-$env:CONFIGURATION.zip C:\openvswitch + - ps: Push-AppveyorArtifact C:\ovs-master-$env:CONFIGURATION.zip + - ps: Push-AppveyorArtifact C:\OpenvSwitch-$env:CONFIGURATION.msi