[Openvpn-devel,v1] GHA: clean up libressl builds with newer libressl

Message ID 20231201123649.18127-1-frank@lichtenheld.com
State Accepted
Headers show
Series [Openvpn-devel,v1] GHA: clean up libressl builds with newer libressl | expand

Commit Message

Frank Lichtenheld Dec. 1, 2023, 12:36 p.m. UTC
- Update to latest stable release
- Work-around patches not required anymore
- Official URL of repo has changed

Change-Id: I9b8e69f2b9838cea4cb9001f4e8960b8a39724ef
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master and release/2.6.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/461
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Arne Schwabe <arne-openvpn@rfc2549.org>

Comments

Gert Doering Dec. 2, 2023, 2:12 p.m. UTC | #1
Your patch has been applied to the master and release/2.6 branch.

Tested in my local GH repo, and only the expected failures (ASAN) were
seen.

commit 664dde85be91a5432efe52c90089fcf2bf5d6a3c (master)
commit 1a6aef37781975ea9cc18dde6083ebb2683e6251 (release/2.6)
Author: Frank Lichtenheld
Date:   Fri Dec 1 13:36:49 2023 +0100

     GHA: clean up libressl builds with newer libressl

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
     Message-Id: <20231201123649.18127-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27635.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cd72f3d..4393f5c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -323,22 +323,11 @@ 
         uses: actions/checkout@v3
         with:
           path: libressl
-          repository: libressl-portable/portable
-          ref: v3.7.0
-      # LibreSSL has master in the OPENBSD_BRANCH by default even in the tagged releases
-      # Manually use the OpenBSD branch that is more appropiate and remove git pull that
-      # breaks when checking out a tag instead of branch
-      - name: "libressl: fix build"
-        run: |
-           echo libressl-v3.7.0 > OPENBSD_BRANCH
-           sed -i -e 's/ git pull --rebase//' update.sh
-        working-directory: libressl
+          repository: libressl/portable
+          ref: v3.8.2
       - name: "libressl: autogen.sh"
         run: ./autogen.sh
         working-directory: libressl
-      - name: "libressl: autoconf"
-        run: autoreconf -fvi
-        working-directory: libressl
       - name: "libressl: configure"
         run: ./configure
         working-directory: libressl