[Openvpn-devel,25/25] dco-win: update GH Actions config file

Message ID 20220624083809.23487-26-a@unstable.cc
State Changes Requested
Headers show
Series
  • ovpn-dco: introduce data-channel offload support
Related show

Commit Message

Antonio Quartulli June 24, 2022, 8:38 a.m.
Signed-off-by: Lev Stipakov <lev@openvpn.net>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 .github/workflows/build.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Frank Lichtenheld July 5, 2022, 9:32 a.m. | #1
I think this commit could use an additional sentence
in the commit message on why exactly you remove this?

Doesn't immediately make sense to me.

On Fri, Jun 24, 2022 at 10:38:09AM +0200, Antonio Quartulli wrote:
> Signed-off-by: Lev Stipakov <lev@openvpn.net>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> ---
>  .github/workflows/build.yaml | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
> index b905c0d2..536dd9d6 100644
> --- a/.github/workflows/build.yaml
> +++ b/.github/workflows/build.yaml
> @@ -59,11 +59,6 @@ jobs:
>      steps:
>        - name: Install dependencies
>          run: sudo apt update && sudo apt install -y mingw-w64 libtool automake autoconf man2html unzip
> -      - name: Checkout ovpn-dco-win
> -        uses: actions/checkout@v2
> -        with:
> -          repository: OpenVPN/ovpn-dco-win
> -          path: ovpn-dco-win
>        - name: Checkout OpenVPN
>          uses: actions/checkout@v2
>          with:
> @@ -151,7 +146,7 @@ jobs:
>          run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h ${HOME}/mingw/opt/include/
>  
>        - name: configure OpenVPN
> -        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4 --enable-dco
> +        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4
>          working-directory: openvpn
>  
>        - name: build OpenVPN

Regards,
Antonio Quartulli July 5, 2022, 9:36 a.m. | #2
Hi,

On 05/07/2022 11:32, Frank Lichtenheld wrote:
> I think this commit could use an additional sentence
> in the commit message on why exactly you remove this?
> 
> Doesn't immediately make sense to me.

To be honest, I am not even sure why we have a build with DCO in the 
first place. There is no DCO code yet in master but somehow we have the 
GH action for that :-D

Anyway, can add a sentence to explain what is going on.

Cheers,

> 
> On Fri, Jun 24, 2022 at 10:38:09AM +0200, Antonio Quartulli wrote:
>> Signed-off-by: Lev Stipakov <lev@openvpn.net>
>> Signed-off-by: Antonio Quartulli <a@unstable.cc>
>> ---
>>   .github/workflows/build.yaml | 7 +------
>>   1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
>> index b905c0d2..536dd9d6 100644
>> --- a/.github/workflows/build.yaml
>> +++ b/.github/workflows/build.yaml
>> @@ -59,11 +59,6 @@ jobs:
>>       steps:
>>         - name: Install dependencies
>>           run: sudo apt update && sudo apt install -y mingw-w64 libtool automake autoconf man2html unzip
>> -      - name: Checkout ovpn-dco-win
>> -        uses: actions/checkout@v2
>> -        with:
>> -          repository: OpenVPN/ovpn-dco-win
>> -          path: ovpn-dco-win
>>         - name: Checkout OpenVPN
>>           uses: actions/checkout@v2
>>           with:
>> @@ -151,7 +146,7 @@ jobs:
>>           run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h ${HOME}/mingw/opt/include/
>>   
>>         - name: configure OpenVPN
>> -        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4 --enable-dco
>> +        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4
>>           working-directory: openvpn
>>   
>>         - name: build OpenVPN
> 
> Regards,
Lev Stipakov July 5, 2022, 10:38 a.m. | #3
We have moved dco-win uapi header to openvpn repo, so we don't have to
checkout ovpn-dco-win repo to get it - this is what this commit does.
But yeah, good point on having dco builds without dco.

ti 5. heinäk. 2022 klo 12.36 Antonio Quartulli (a@unstable.cc) kirjoitti:
>
> Hi,
>
> On 05/07/2022 11:32, Frank Lichtenheld wrote:
> > I think this commit could use an additional sentence
> > in the commit message on why exactly you remove this?
> >
> > Doesn't immediately make sense to me.
>
> To be honest, I am not even sure why we have a build with DCO in the
> first place. There is no DCO code yet in master but somehow we have the
> GH action for that :-D
>
> Anyway, can add a sentence to explain what is going on.
>
> Cheers,
>
> >
> > On Fri, Jun 24, 2022 at 10:38:09AM +0200, Antonio Quartulli wrote:
> >> Signed-off-by: Lev Stipakov <lev@openvpn.net>
> >> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> >> ---
> >>   .github/workflows/build.yaml | 7 +------
> >>   1 file changed, 1 insertion(+), 6 deletions(-)
> >>
> >> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
> >> index b905c0d2..536dd9d6 100644
> >> --- a/.github/workflows/build.yaml
> >> +++ b/.github/workflows/build.yaml
> >> @@ -59,11 +59,6 @@ jobs:
> >>       steps:
> >>         - name: Install dependencies
> >>           run: sudo apt update && sudo apt install -y mingw-w64 libtool automake autoconf man2html unzip
> >> -      - name: Checkout ovpn-dco-win
> >> -        uses: actions/checkout@v2
> >> -        with:
> >> -          repository: OpenVPN/ovpn-dco-win
> >> -          path: ovpn-dco-win
> >>         - name: Checkout OpenVPN
> >>           uses: actions/checkout@v2
> >>           with:
> >> @@ -151,7 +146,7 @@ jobs:
> >>           run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h ${HOME}/mingw/opt/include/
> >>
> >>         - name: configure OpenVPN
> >> -        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4 --enable-dco
> >> +        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4
> >>           working-directory: openvpn
> >>
> >>         - name: build OpenVPN
> >
> > Regards,
>
> --
> Antonio Quartulli
>
>
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Gert Doering Aug. 4, 2022, 3:28 p.m. | #4
Hi,

On Tue, Jul 05, 2022 at 11:36:37AM +0200, Antonio Quartulli wrote:
> On 05/07/2022 11:32, Frank Lichtenheld wrote:
> > I think this commit could use an additional sentence
> > in the commit message on why exactly you remove this?
> > 
> > Doesn't immediately make sense to me.
> 
> To be honest, I am not even sure why we have a build with DCO in the 
> first place. There is no DCO code yet in master but somehow we have the 
> GH action for that :-D

Now there *is* DCO code in master, so why removing the --enable-dco?

So this patch definitely needs some more thought :-)

(And I thought there is an easy one to apply)

gert

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b905c0d2..536dd9d6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -59,11 +59,6 @@  jobs:
     steps:
       - name: Install dependencies
         run: sudo apt update && sudo apt install -y mingw-w64 libtool automake autoconf man2html unzip
-      - name: Checkout ovpn-dco-win
-        uses: actions/checkout@v2
-        with:
-          repository: OpenVPN/ovpn-dco-win
-          path: ovpn-dco-win
       - name: Checkout OpenVPN
         uses: actions/checkout@v2
         with:
@@ -151,7 +146,7 @@  jobs:
         run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h ${HOME}/mingw/opt/include/
 
       - name: configure OpenVPN
-        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4 --enable-dco
+        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure  --host=${CHOST} --disable-lz4
         working-directory: openvpn
 
       - name: build OpenVPN