diff mbox series

[ovs-dev,v3,8/8] appveyor: Bump outdated links and add artifacts

Message ID 20200924062403.1911-1-aserdean@ovn.org
State Accepted
Headers show
Series [ovs-dev,v3,1/8] windows: Remove unused variable | expand

Commit Message

Alin-Gabriel Serdean Sept. 24, 2020, 6:24 a.m. UTC 
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 <luoyonggang@gmail.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Co-authored-by: Jinjun Gao <jinjung@vmware.com>
Signed-off-by: Jinjun Gao <jinjung@vmware.com>
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
---
 appveyor.yml | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

Comments

0-day Robot Sept. 24, 2020, 7:19 a.m. UTC | #1 
Bleep bloop.  Greetings Alin Gabriel Serdean, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
WARNING: Line is 397 characters long (recommended limit is 79)
#80 FILE: appveyor.yml:45:
- 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%\""

WARNING: Line is 93 characters long (recommended limit is 79)
#82 FILE: appveyor.yml:47:
- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make datapath_windows_analyze"

WARNING: Line is 86 characters long (recommended limit is 79)
#84 FILE: appveyor.yml:49:
- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/openvswitch_compile && make windows_installer"

WARNING: Line is 108 characters long (recommended limit is 79)
#87 FILE: appveyor.yml:52:
- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package\* C:\openvswitch\driver

WARNING: Line is 110 characters long (recommended limit is 79)
#88 FILE: appveyor.yml:53:
- ps: cp C:\openvswitch_compile\datapath-windows\x64\Win10$env:CONFIGURATION\package.cer C:\openvswitch\driver

WARNING: Line is 124 characters long (recommended limit is 79)
#90 FILE: appveyor.yml:55:
- cp c:\openvswitch_compile\windows\ovs-windows-installer\bin\x64\Release\OpenvSwitch.msi c:\OpenvSwitch-%CONFIGURATION%.msi

Lines checked: 98, Warnings: 6, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
Jinjun Gao Sept. 25, 2020, 10:24 a.m. UTC | #2 
Thanks for working on it. It looks good to me.
+Ack. 

- Jinjun
 

On 2020/9/24, 2:24 PM, "Alin Gabriel Serdean" <aserdean@ovn.org> wrote:

    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 <luoyonggang@gmail.com>
    Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
    Co-authored-by: Jinjun Gao <jinjung@vmware.com>
    Signed-off-by: Jinjun Gao <jinjung@vmware.com>
    Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
    ---
     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://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fslproweb.com%2Fdownload%2FWin32OpenSSL-1_0_2t.exe&amp;data=02%7C01%7Cjinjung%40vmware.com%7C79ef2d3f21874ad6a00108d860527958%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637365254633884741&amp;sdata=tWKNMO9p8DtmxO9Llbe2JJLTzfgbdvDRU%2F%2F71f88P0o%3D&amp;reserved=0"
    +    mkdir C:\openvswitch\driver

    -    $destination = "C:\ovs-build-downloads\Win32OpenSSL-1_0_2t.exe"
    +    $source = "https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fslproweb.com%2Fdownload%2FWin64OpenSSL-1_0_2u.exe&amp;data=02%7C01%7Cjinjung%40vmware.com%7C79ef2d3f21874ad6a00108d860527958%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637365254633884741&amp;sdata=fxm0tyK1J37WGnrfMy%2BoSam%2Fkbj2pVGHG3fseEqNFRc%3D&amp;reserved=0"

    -    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
    -- 
    2.27.0.windows.1
Ilya Maximets Sept. 25, 2020, 1:55 p.m. UTC | #3 
On 9/24/20 8:24 AM, Alin Gabriel Serdean wrote:
> 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 <luoyonggang@gmail.com>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> Co-authored-by: Jinjun Gao <jinjung@vmware.com>
> Signed-off-by: Jinjun Gao <jinjung@vmware.com>
> Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
> ---

Thanks for working on this.  I didn't test the series on Windows,
but I'm assuming that you did that.  This version does not break
anything on other systems and the code looks good to me.

For the series:

Acked-by: Ilya Maximets <i.maximets@ovn.org>


P.S. While this series is good as it is and could be applied, I'd
still like to update to openssl 1.1.1 if possible in the future.
If it's not possible for some reason, we should, probably, find a
way to make it possible.

Best regards, Ilya Maximets.
Ilya Maximets Oct. 5, 2020, 2:14 p.m. UTC | #4 
On 10/5/20 2:54 PM, Alin Serdean wrote:
>> *From: *Ilya Maximets <mailto:i.maximets@ovn.org>
> *Sent: *Friday, September 25, 2020 4:55 PM
> *To: *Alin Gabriel Serdean <mailto:aserdean@ovn.org>; ovs-dev@openvswitch.org <mailto:ovs-dev@openvswitch.org>
> *Cc: *i.maximets@ovn.org <mailto:i.maximets@ovn.org>; Yonggang Luo <mailto:luoyonggang@gmail.com>; Jinjun Gao <mailto:jinjung@vmware.com>
> *Subject: *Re: [ovs-dev] [PATCH v3 8/8] appveyor: Bump outdated links and add artifacts
> 
>  
> 
> On 9/24/20 8:24 AM, Alin Gabriel Serdean wrote:
> 
>> 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 <luoyonggang@gmail.com>
> 
>> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> 
>> Co-authored-by: Jinjun Gao <jinjung@vmware.com>
> 
>> Signed-off-by: Jinjun Gao <jinjung@vmware.com>
> 
>> Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
> 
>> ---
> 
>  
> 
> Thanks for working on this.  I didn't test the series on Windows,
> 
> but I'm assuming that you did that.  This version does not break
> 
> anything on other systems and the code looks good to me.
> 
>  
> 
> For the series:
> 
>  
> 
> Acked-by: Ilya Maximets <i.maximets@ovn.org>
> 
>  
> 
> [Alin] Thank you for the review! I applied it on master.
> 
>  
> 
> P.S. While this series is good as it is and could be applied, I'd
> 
> still like to update to openssl 1.1.1 if possible in the future.
> 
> If it's not possible for some reason, we should, probably, find a
> 
> way to make it possible.
> 
> [Alin] I’m applying the current series and will send a future
> 
> patch for openssl 1.1.1 when I have a successful unit test run.

OK.  Sounds good.  Thanks!

Best reards, Ilya Maximets.
diff mbox series

Patch

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