[Openvpn-devel] Fix LibreSSL not building in Github Actions

Message ID 20230209163115.465548-1-arne@rfc2549.org
State Accepted
Headers show
Series [Openvpn-devel] Fix LibreSSL not building in Github Actions | expand

Commit Message

Arne Schwabe Feb. 9, 2023, 4:31 p.m. UTC
During the build of LibreSSL portable it pulls in a branch from OpenBSD
upstream. Unfortunately they use master there instead of a fixed branch.
So we work around this issue.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
 .github/workflows/build.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)


Gert Doering Feb. 9, 2023, 5:27 p.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Arne has said I should not look at this patch.  So I'm despearately looking
elsewhere.  I do not want to know.

(Github says "it builds with this change")

Your patch has been applied to the master branch.

commit 589cca156357e05c6c3f07517184157585c8e9fc (master)
commit dabfebc4731b7cccda36a09eaaa11f912b8a9fde (release/2.6)
Author: Arne Schwabe
Date:   Thu Feb 9 17:31:15 2023 +0100

     Fix LibreSSL not building in Github Actions

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20230209163115.465548-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/search?l=mid&q=20230209163115.465548-1-arne@rfc2549.org
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 132624547..5888e91e5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -415,6 +415,14 @@  jobs:
           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
       - name: "libressl: autogen.sh"
         run: ./autogen.sh
         working-directory: libressl