From: "flichtenheld (Code Review)"
Date: Mon, 20 Apr 2026 14:32:35 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, yura.uddr@...277...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="F7exkaekMtc="; charset=UTF-8
Subject: [Openvpn-devel] [L] Change in openvpn[master]: GHA: Factor out
building SSL libs to a reusable workflow
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , uddr
Cc: openvpn-devel
--F7exkaekMtc=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos, uddr.
Hello plaisthos, uddr,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1630?usp=3Demail
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+2 by uddr
The change is no longer submittable: Code-Review and checks~ChecksSubmitRul=
e are unsatisfied now.
Change subject: GHA: Factor out building SSL libs to a reusable workflow
......................................................................
GHA: Factor out building SSL libs to a reusable workflow
We amassed a lot of code duplication there. Make
it easier to track the differences between the libraries.
Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Signed-off-by: Frank Lichtenheld
---
M .github/workflows/build.yaml
A .github/workflows/test-ssllib.yml
M renovate.json
3 files changed, 155 insertions(+), 313 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/1630/3
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 365e72a..e4cb799 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -304,324 +304,49 @@
!${{ github.workspace }}/out/**/vcpkg_installed/**
libressl:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [libressl]
- build: [ normal, asan ]
- configureflags: ["--with-openssl-engine=3Dno"]
- include:
- - build: asan
- cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn=
o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame=
-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g"
- ldflags: ""
- cc: gcc
-
- name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s=
sllib}}"
- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- UBSAN_OPTIONS: print_stacktrace=3D1
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: libressl
+ ovpnlibdesc: LibreSSL
# versioning=3Dsemver-coerced
- LIBRESSL_REPO: libressl/portable
- LIBRESSL_VERSION: v4.2.1
- LIBRESSL_INSTALL: /opt/libressl
+ ghrepo: libressl/portable
+ gitref: v4.2.1
+ libconfigure: "LIBRESSL_GIT_OPTIONS=3D--no-single-branch ./autogen.s=
h && ./configure --prefix=3D$LIBPREFIX"
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d=
ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils =
libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore libressl from cache
- uses: actions/cache@...3010...
- id: libressl-cache
- with:
- path: ${{ env.LIBRESSL_INSTALL }}
- key: ${{ matrix.os }}-libressl-${{matrix.build }}-${{ env.LIBRES=
SL_VERSION }}
- - name: "libressl: checkout"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:
- path: libressl
- repository: ${{ env.LIBRESSL_REPO }}
- ref: ${{ env.LIBRESSL_VERSION }}
- - name: "libressl: autogen.sh"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true'
- env:
- LIBRESSL_GIT_OPTIONS: "--no-single-branch"
- run: ./autogen.sh
- working-directory: libressl
- - name: "libressl: configure"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true'
- run: ./configure --prefix=3D${{ env.LIBRESSL_INSTALL }}
- working-directory: libressl
- - name: "libressl: make all"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true'
- run: make -j3
- working-directory: libressl
- - name: "libressl: make install"
- if: steps.libressl-cache.outputs.cache-hit !=3D 'true'
- run: sudo make install
- working-directory: libressl
- - name: "ldconfig"
- run: sudo ldconfig
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure
- run: |
- OPENSSL_CFLAGS=3D"-I${{ env.LIBRESSL_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto=
" \
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.LIBRESSL_INSTALL }}/lib" \
- ./configure --with-crypto-library=3Dopenssl --enable-werror ${{m=
atrix.configureflags}}
- - name: make all
- run: make -j3
- - name: Ensure the build uses LibreSSL
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "library versions: Lib=
reSSL"
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
-
- openssl:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [openssl]
- build: [ normal, asan ]
- configureflags: ["--with-openssl-engine=3Dno"]
- include:
- - build: asan
- cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn=
o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame=
-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g"
- ldflags: ""
- cc: gcc
-
- name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s=
sllib}} - 4.0"
- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- UBSAN_OPTIONS: print_stacktrace=3D1
+ openssl4:
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: openssl
+ ovpnlibdesc: OpenSSL 4.
# versioning=3Dsemver-coerced
- OPENSSL_REPO: openssl/openssl
- OPENSSL_VERSION: openssl-4.0.0-beta1
- OPENSSL_INSTALL: /opt/openssl
-
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d=
ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils =
libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore OpenSSL 4.0 from cache
- uses: actions/cache@...3010...
- id: openssl-cache
- with:
- path: ${{ env.OPENSSL_INSTALL }}
- key: ${{ matrix.os }}-openssl-${{matrix.build }}-${{ env.OPENSSL=
_VERSION }}
- - name: "openssl: checkout"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:
- path: openssl
- repository: ${{ env.OPENSSL_REPO }}
- ref: ${{ env.OPENSSL_VERSION }}
- - name: "openssl: configure"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: ./Configure --prefix=3D${{ env.OPENSSL_INSTALL }} --libdir=
=3D${{ env.OPENSSL_INSTALL }}/lib --openssldir=3D${{ env.OPENSSL_INSTALL }}=
-g
- working-directory: openssl
- - name: "openssl: make all"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: make -j3
- working-directory: openssl
- - name: "openssl: make install"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: sudo make install
- working-directory: openssl
- - name: "ldconfig"
- run: sudo ldconfig
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure
- run: |
- OPENSSL_CFLAGS=3D"-I${{ env.OPENSSL_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto"=
\
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.OPENSSL_INSTALL }}/lib" \
- ./configure --with-crypto-library=3Dopenssl --enable-werror ${{m=
atrix.configureflags}}
- - name: make all
- run: make -j3
- - name: Ensure the build uses Openssl
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "library versions: Ope=
nSSL 4.0"
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
+ ghrepo: openssl/openssl
+ gitref: openssl-4.0.0-beta1
+ libconfigure: ./Configure --prefix=3D$LIBPREFIX --libdir=3D$LIBPREFI=
X/lib --openssldir=3D$LIBPREFIX -g
mbedtls4:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [mbedtls4]
- build: [ normal, asan ]
- include:
- - build: asan
- cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn=
o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame=
-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g"
- ldflags: ""
- cc: gcc
-
- name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s=
sllib}}"
- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- UBSAN_OPTIONS: print_stacktrace=3D1
- PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: mbedtls
+ ovpnlibname: mbedtls
+ ovpnlibdesc: mbed TLS 4.
# versioning=3Dsemver-coerced
- MBEDTLS_REPO: Mbed-TLS/mbedtls
- MBEDTLS_VERSION: v4.0.0
- MBEDTLS_INSTALL: /opt/mbedtls4
-
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d=
ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils =
python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libc=
ap-ng-dev libnl-genl-3-dev
- - name: Restore mbed TLS from cache
- uses: actions/cache@...3010...
- id: mbedtls-cache
- with:
- path: ${{ env.MBEDTLS_INSTALL }}
- key: ${{ matrix.os }}-mbedtls-${{matrix.build }}-${{ env.MBEDTLS=
_VERSION }}
- - name: "mbedtls: checkout"
- if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:
- path: mbedtls
- submodules: recursive
- repository: ${{ env.MBEDTLS_REPO }}
- ref: ${{ env.MBEDTLS_VERSION }}
- - uses: lukka/get-cmake@...2999... # v4.2.3
- - name: "mbedtls: cmake"
- if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'
- run: cmake -B build -DCMAKE_INSTALL_PREFIX=3D${{ env.MBEDTLS_INSTA=
L }}
- working-directory: mbedtls
- - name: "mbedtls: cmake --build"
- if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'
- run: cmake --build build
- working-directory: mbedtls
- - name: "mbedtls: cmake --install"
- if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'
- run: sudo cmake --install build
- working-directory: mbedtls
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure
- run: ./configure --with-crypto-library=3Dmbedtls --enable-werror
- - name: make all
- run: make -j3
- - name: Ensure the build uses mbed TLS ${{ env.MBEDTLS_VERSION }}
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "library versions: mbe=
d TLS 4."
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
+ ghrepo: Mbed-TLS/mbedtls
+ gitref: v4.0.0
+ libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=3D$LIBPREFIX
+ libmake: cmake --build build
+ libinstall: sudo cmake --install build
+ ovpnconfigureenv: PKG_CONFIG_PATH=3D$LIBPREFIX/lib/pkgconfig
aws-lc:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [ awslc ]
- build: [ normal, asan ]
- include:
- - build: asan
- cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn=
o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame=
-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- cxx: clang++
- - build: normal
- cflags: "-O2 -g"
- ldflags: ""
- cc: gcc
- cxx: c++
-
- name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s=
sllib}}"
- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- CXX: ${{matrix.cxx}}
- UBSAN_OPTIONS: print_stacktrace=3D1
- AWS_LC_INSTALL: /opt/aws-lc
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: aws-lc
+ ovpnlibdesc: AWS-LC
# versioning=3Dsemver-coerced
- AWS_LC_REPO: aws/aws-lc
- AWS_LC_VERSION: v1.70.0
-
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt install -y gcc golang make liblzo=
2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev p=
ython3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf=
pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore AWS-LC from cache
- uses: actions/cache@...3010...
- id: aws-lc-cache
- with:
- path: ${{ env.AWS_LC_INSTALL }}
- key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_V=
ERSION }}
- - name: "AWS-LC: checkout"
- if: steps.aws-lc-cache.outputs.cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:
- path: aws-lc
- repository: ${{ env.AWS_LC_REPO }}
- ref: ${{ env.AWS_LC_VERSION }}
- - uses: lukka/get-cmake@...2999... # v4.2.3
- - name: "AWS-LC: build"
- if: steps.aws-lc-cache.outputs.cache-hit !=3D 'true'
- run: |
- mkdir build
- cd build
- cmake -GNinja -DCMAKE_BUILD_TYPE=3DRelease -DCMAKE_INSTALL_PREFI=
X=3D"${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=3D1 ../
- ninja install
- working-directory: aws-lc
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure with AWS-LC
- run: |
- OPENSSL_CFLAGS=3D"-I${{ env.AWS_LC_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.AWS_LC_INSTALL }}/lib" \
- ./configure --with-crypto-library=3Dopenssl
- - name: make all
- run: make -j3
- - name: Ensure the build uses AWS-LC
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "library versions: AWS=
-LC"
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
+ ghrepo: aws/aws-lc
+ gitref: v1.70.0
+ libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=3DRelease -D=
CMAKE_INSTALL_PREFIX=3D"$LIBPREFIX" -DBUILD_SHARED_LIBS=3D1
+ libmake: cmake --build build
+ libinstall: sudo cmake --install build
+ # not ready for --enable-werror
+ ovpnconfigureflags:
diff --git a/.github/workflows/test-ssllib.yml b/.github/workflows/test-ssl=
lib.yml
new file mode 100644
index 0000000..c6a2e44
--- /dev/null
+++ b/.github/workflows/test-ssllib.yml
@@ -0,0 +1,117 @@
+name: test_ssllib
+
+on:
+ workflow_call:
+ inputs:
+ libname:
+ required: true
+ type: string
+ ovpnlibname:
+ type: string
+ default: openssl
+ ovpnlibdesc:
+ required: true
+ type: string
+ ghrepo:
+ required: true
+ type: string
+ gitref:
+ required: true
+ type: string
+ libconfigure:
+ required: true
+ type: string
+ libmake:
+ type: string
+ default: "make -j3"
+ libinstall:
+ type: string
+ default: "sudo make install"
+ ovpnconfigureenv:
+ type: string
+ default: >-
+ OPENSSL_CFLAGS=3D"-I$LIBPREFIX/include"
+ OPENSSL_LIBS=3D"-L$LIBPREFIX/lib -lssl -lcrypto"
+ LDFLAGS=3D"-Wl,-rpath=3D$LIBPREFIX/lib"
+ ovpnconfigureflags:
+ type: string
+ default: --enable-werror --with-openssl-engine=3Dno
+
+jobs:
+ test_ssllib:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-24.04]
+ build: [normal, asan]
+ include:
+ - build: asan
+ cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fn=
o-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame=
-pointer -g -O1"
+ ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
+ cc: clang
+ cxx: clang++
+ - build: normal
+ cflags: "-O2 -g"
+ ldflags: ""
+ cc: gcc
+ cxx: g++
+
+ name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{inputs.l=
ibname}}"
+ runs-on: ${{matrix.os}}
+ env:
+ CFLAGS: ${{matrix.cflags}}
+ LDFLAGS: ${{matrix.ldflags}}
+ CC: ${{matrix.cc}}
+ CXX: ${{matrix.cxx}}
+ UBSAN_OPTIONS: print_stacktrace=3D1
+ LIBPREFIX: /opt/${{inputs.libname}}
+
+ steps:
+ - name: Install dependencies
+ run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-d=
ev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils =
libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
+ - name: Restore ${{inputs.libname}} from cache
+ uses: actions/cache@...3024... # v5.0.5
+ id: ssllib-cache
+ with:
+ path: ${{env.LIBPREFIX}}
+ key: ${{matrix.os}}-${{inputs.libname}}-${{matrix.build }}-${{in=
puts.gitref}}
+ - name: "${{inputs.libname}}: checkout"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ uses: actions/checkout@...2998... # v6.0.2
+ with:
+ submodules: recursive
+ path: ${{inputs.libname}}
+ repository: ${{inputs.ghrepo}}
+ ref: ${{inputs.gitref}}
+ - name: "${{inputs.libname}}: configure"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.libconfigure}}
+ working-directory: ${{inputs.libname}}
+ - name: "${{inputs.libname}}: build"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.libmake}}
+ working-directory: ${{inputs.libname}}
+ - name: "${{inputs.libname}}: install"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.libinstall}}
+ working-directory: ${{inputs.libname}}
+ - name: Run ldconfig
+ run: sudo ldconfig
+ - name: "OpenVPN: checkout"
+ uses: actions/checkout@...2998... # v6.0.2
+ - name: "OpenVPN: autoreconf"
+ run: autoreconf -fvi
+ - name: "OpenVPN: configure"
+ run: |
+ ${{inputs.ovpnconfigureenv}} \
+ ./configure --with-crypto-library=3D${{inputs.ovpnlibname}} ${{i=
nputs.ovpnconfigureflags}}
+ - name: "OpenVPN: build"
+ run: make -j3
+ - name: Ensure the build uses ${{inputs.libname}}
+ run: |
+ ./src/openvpn/openvpn --version
+ ./src/openvpn/openvpn --version | grep -q "library versions: ${{=
inputs.ovpnlibdesc}}"
+ - name: "OpenVPN: configure checks"
+ run: echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
+ - name: "OpenVPN: make check"
+ run: make -j3 check VERBOSE=3D1
diff --git a/renovate.json b/renovate.json
index f9c62c4..809ac3f 100644
--- a/renovate.json
+++ b/renovate.json
@@ -40,7 +40,7 @@
"/^\\.github/workflows/.+\\.ya?ml$/"
],
"matchStrings": [
- "versioning=3D(?.*?)\\n\\s*.*?_REPO:\\s*(?.*?)\\n\\s*.*?_VERSION:\\s*(?.*?)\\n"
+ "versioning=3D(?.*?)\\n\\s*ghrepo:\\s*(?.*?)\\n\\s*gitrepo:\\s*(?.*?)\\n"
],
"datasourceTemplate": "github-tags"
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings?usp=3Demail
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-Reviewer: uddr
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-Attention: uddr
--F7exkaekMtc=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is cur=
rently required from: flichtenheld, plaisthos, uddr.
flichtenheld uploaded patch set #3 to this change.
<=
p>View C=
hange
The following approvals got outdated and were removed:
Code-Review+2 by uddr
The change is no longer submittable: Code-Revie=
w and checks~ChecksSubmitRule are unsatisfied now.
GHA: Fa=
ctor out building SSL libs to a reusable workflow
We amassed a lot o=
f code duplication there. Make
it easier to track the differences betwee=
n the libraries.
Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc=
8
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---
M =
.github/workflows/build.yaml
A .github/workflows/test-ssllib.yml
M re=
novate.json
3 files changed, 155 insertions(+), 313 deletions(-)
=
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/ch=
anges/30/1630/3
diff --git a/.github/workflows/build.yaml b/.github=
/workflows/build.yaml
index 365e72a..e4cb799 100644<=
br>--- a/.github/workflows/build.yaml
+++ b/.github/w=
orkflows/build.yaml
@@ -304,324 +304,49 @@
=
!${{ github.workspace }}/out/**/vcpkg_installed/**
<=
span>
libressl:
- strategy:
- fail-fast: false
- matrix:
- =
os: [ubuntu-24.04]
- ssllib: [libressl]
- build: [ normal, asan ]
- configureflags: ["--with-openssl-engine=3Dn=
o"]
- inclu=
de:
- - build:=
asan
- cfla=
gs: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fno-optimize-s=
ibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g =
-O1"
- =
ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
- cc: clang
- - build: normal
- cflags: "-O2 -g&qu=
ot;
- ldflag=
s: ""
- =
cc: gcc
-<=
br>- name: "${{matrix.cc}=
} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}"
<=
span style=3D"color: hsl(0, 100%, 40%);">- runs-on: ${{matrix.os}}
- env:
- CFLAGS: ${{ matrix.cflags }}
- LDFLAGS: ${{ matrix.l=
dflags }}
- CC: ${=
{matrix.cc}}
- UBS=
AN_OPTIONS: print_stacktrace=3D1
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: libressl
+ ovpnlibdesc: LibreSSL
# versioning=3Dsemver-coerced
- LIBRESSL_REPO: libressl/portable
- LIBRESSL_VERSION: v4.2.1
- LIBRESSL_INSTALL: /opt/li=
bressl
+ ghrepo:=
libressl/portable
+ =
gitref: v4.2.1
+=
libconfigure: "LIBRESSL_GIT_OPTIONS=3D--no-single-branch ./autog=
en.sh && ./configure --prefix=3D$LIBPREFIX"
<=
/span>
- steps:
<=
span style=3D"color: hsl(0, 100%, 40%);">- - name: Install dependencie=
s
- run: sudo ap=
t update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev=
linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool autom=
ake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore libressl from cache<=
/span>
- uses: actions/=
cache@...3010...
- =
id: libressl-cache
-=
with:
- =
path: ${{ env.LIBRESSL_INSTALL }}
- key: ${{ matrix.os }}-libressl-${{matrix.build }}-$=
{{ env.LIBRESSL_VERSION }}
- - name: "libressl: checkout"
- if: steps.libressl-cache.outputs.cache-=
hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.0.2
- with:
- path: libressl
- repository: ${{ env.LIBRESSL_REPO }}=
span>
- ref: ${{ env.=
LIBRESSL_VERSION }}
- =
- name: "libressl: autogen.sh"
- if: steps.libressl-cache.outputs.cache-hit !=
=3D 'true'
- =
env:
- LI=
BRESSL_GIT_OPTIONS: "--no-single-branch"
- run: ./autogen.sh
- working-directory: libressl=
- - name: "libressl=
: configure"
- =
if: steps.libressl-cache.outputs.cache-hit !=3D 'true'- run: ./configure --pre=
fix=3D${{ env.LIBRESSL_INSTALL }}
- working-directory: libressl
- - name: "libressl: make all"
- if: steps.libressl=
-cache.outputs.cache-hit !=3D 'true'
- run: make -j3
- working-directory: libressl
- - name: "libressl: make ins=
tall"
- if:=
steps.libressl-cache.outputs.cache-hit !=3D 'true'
- run: sudo make install=
- working-directory: l=
ibressl
- - name: =
"ldconfig"
- =
run: sudo ldconfig
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
<=
span style=3D"color: hsl(0, 100%, 40%);">- - name: autoconf
=
- run: autoreconf -fvi
- - name: configure=
span>
- run: |- OPENSSL_CFLAGS=3D&qu=
ot;-I${{ env.LIBRESSL_INSTALL }}/include" \
- OPENSSL_LIBS=3D"-L${{ env.LIBRESS=
L_INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=3D${{ env.LIBRESSL_I=
NSTALL }}/lib" \
-=
./configure --with-crypto-library=3Dopenssl --enable-werror ${{ma=
trix.configureflags}}
-=
- name: make all
=
- run: make -j3
=
- - name: Ensure the build uses LibreSSL
- run: |
- ./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --vers=
ion | grep -q "library versions: LibreSSL"
- - name: configure checks
- run: echo 'RUN_SUDO=3D=
"sudo -E"' >tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1<=
/span>
-
- openssl:
- strategy:
- fail-fast: false
- matrix:
- os: [ubuntu-24.04]
- ssllib: [openssl]
- build: [ normal, asan ]
- configureflags: ["--with-openssl-engi=
ne=3Dno"]
- =
include:
- - =
build: asan
- =
cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fno-opti=
mize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-point=
er -g -O1"
- =
ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
<=
span style=3D"color: hsl(0, 100%, 40%);">- cc: clang
<=
span style=3D"color: hsl(0, 100%, 40%);">- - build: normal<=
br>- cflags: "-O2=
-g"
- =
ldflags: ""
-=
cc: gcc
-=
span>
- name: "${{matr=
ix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0"=
- runs-on: ${{matri=
x.os}}
- env:=
- CFLAGS: ${{ matrix.cfl=
ags }}
- LDFLAGS: =
${{ matrix.ldflags }}
-=
CC: ${{matrix.cc}}
- UBSAN_OPTIONS: print_stacktrace=3D1
+ openssl4:
+ uses: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: openssl
+ ovpnlibdesc: OpenSSL 4. # versioning=3Dsemver-coerced
- OPENSSL_REPO: openssl/openssl
- OPENSSL_VERSION: openssl-4.0.0-b=
eta1
- OPENSSL_INS=
TALL: /opt/openssl
-
- steps:
- - name: Install dependencies<=
/span>
- run: sudo apt =
update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev l=
inux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automak=
e autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore OpenSSL 4.0 from cach=
e
- uses: action=
s/cache@...3010...
- =
id: openssl-cache
=
- with:
- =
path: ${{ env.OPENSSL_INSTALL }}
- key: ${{ matrix.os }}-openssl-${{matrix.build }}-${=
{ env.OPENSSL_VERSION }}
- - name: "openssl: checkout"
- if: steps.openssl-cache.outputs.cache-hit =
!=3D 'true'
- =
uses: actions/checkout@...2998... # v6.0.2
- with:
- path: openssl
- repository: ${{ env.OPENSSL_REPO }}- ref: ${{ env.OPENSSL=
_VERSION }}
- - na=
me: "openssl: configure"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'tr=
ue'
- run: .=
/Configure --prefix=3D${{ env.OPENSSL_INSTALL }} --libdir=3D${{ env.OPENSS=
L_INSTALL }}/lib --openssldir=3D${{ env.OPENSSL_INSTALL }} -g
- working-directory: openssl<=
/span>
- - name: "op=
enssl: make all"
-=
if: steps.openssl-cache.outputs.cache-hit !=3D 'true'
- run: make -j3
- working-directory: =
openssl
- - name: =
"openssl: make install"
- if: steps.openssl-cache.outputs.cache-hit !=3D 'tru=
e'
- run: su=
do make install
- =
working-directory: openssl
- - name: "ldconfig"
- run: sudo ldconfig
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998...=
# v6.0.2
- - name=
: autoconf
- run=
: autoreconf -fvi
- =
- name: configure
- =
run: |
- =
OPENSSL_CFLAGS=3D"-I${{ env.OPENSSL_INSTALL }}/include" \=
- OPENSSL_LIBS=3D&qu=
ot;-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=
=3D${{ env.OPENSSL_INSTALL }}/lib" \
- ./configure --with-crypto-library=3Dopenssl -=
-enable-werror ${{matrix.configureflags}}
- - name: make all
- run: make -j3
- - name: Ensure the build uses Openssl
=
- run: |
- ./src/openvpn/openvpn --versi=
on
- ./src/ope=
nvpn/openvpn --version | grep -q "library versions: OpenSSL 4.0"<=
/span>
- - name: configur=
e checks
- run: =
echo 'RUN_SUDO=3D"sudo -E"' >tests/t_server_null.rc
- - name: make check=
- run: make -j3=
check VERBOSE=3D1
+ =
ghrepo: openssl/openssl
+ gitref: openssl-4.0.0-beta1
+ libconfigure: ./Configure --prefix=3D$LIBPREFI=
X --libdir=3D$LIBPREFIX/lib --openssldir=3D$LIBPREFIX -g
<=
/span>
mbedtls4:
- strategy:
- =
fail-fast: false
-=
matrix:
- =
os: [ubuntu-24.04]
- =
ssllib: [mbedtls4]
- build: [ normal, asan ]
- include:
- - build: asan
- cflags: "-fsanitize=3Daddress -fno-sanitize-recov=
er=3Dall -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -f=
no-omit-frame-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recove=
r=3Dall
- cc=
: clang
- - bu=
ild: normal
- =
cflags: "-O2 -g"
- ldflags: ""
- cc: gcc
-
- =
name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.s=
sllib}}"
- runs=
-on: ${{matrix.os}}
- =
env:
- CFLAGS: $=
{{ matrix.cflags }}
- =
LDFLAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- UBSAN_OPTIONS: print_stacktrace=3D1
- PKG_CONFIG_PATH: /opt/mbedtls4/li=
b/pkgconfig
+ uses=
: ./.github/workflows/test-ssllib.yml
+ with:
+ libname: mbedtls
+ ovpnlibname: mbedtls
+ ovpnlibdesc: mbed TLS 4.
# v=
ersioning=3Dsemver-coerced
- MBEDTLS_REPO: Mbed-TLS/mbedtls
- MBEDTLS_VERSION: v4.0.0
- MBEDTLS_INSTALL: /opt/mbedtls4
=
-
- steps:
- - name: Install dependencies
- run: sudo apt update && sudo apt in=
stall -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang =
libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool au=
tomake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- - name: Restore mbed TLS from cac=
he
- uses: actio=
ns/cache@...3010...
- =
id: mbedtls-cache
- with:
- =
path: ${{ env.MBEDTLS_INSTALL }}
- key: ${{ matrix.os }}-mbedtls-${{matrix.build }}-$=
{{ env.MBEDTLS_VERSION }}
- - name: "mbedtls: checkout"
- if: steps.mbedtls-cache.outputs.cache-hit=
!=3D 'true'
- =
uses: actions/checkout@...2998... # v6.0.2
- with:
- path: mbedtls
- submodules: recursive
- repository: ${{ env.MBEDTLS_REPO =
}}
- ref: ${{ =
env.MBEDTLS_VERSION }}
=
- - uses: lukka/get-cmake@...2999... # v4.2.3
- - name: "mbedtls: cmake"
- if: steps.mbedtls-c=
ache.outputs.cache-hit !=3D 'true'
- run: cmake -B build -DCMAKE_INSTALL_PREFIX=3D$=
{{ env.MBEDTLS_INSTAL }}
- working-directory: mbedtls
- - name: "mbedtls: cmake --build"
=
- if: steps.mbedtls-cache.=
outputs.cache-hit !=3D 'true'
- run: cmake --build build
- working-directory: mbedtls
- - name: "mbedtls: cmake =
--install"
- =
if: steps.mbedtls-cache.outputs.cache-hit !=3D 'true'
<=
span style=3D"color: hsl(0, 100%, 40%);">- run: sudo cmake --install=
build
- working=
-directory: mbedtls
- =
- name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -fvi
- - name: configure<=
br>- run: ./configure --wi=
th-crypto-library=3Dmbedtls --enable-werror
- - name: make all
- run: make -j3
- - name: Ensure the build uses mbed TLS ${{ env=
.MBEDTLS_VERSION }}
- =
run: |
- =
./src/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "librar=
y versions: mbed TLS 4."
- - name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"'=
>tests/t_server_null.rc
- - name: make check
- run: make -j3 check VERBOSE=3D1
+ ghrepo: Mbed-TLS/mbedtls
+ gitref: v4.0.0
+ libconfigure: cmake -B build=
-DCMAKE_INSTALL_PREFIX=3D$LIBPREFIX
+ libmake: cmake --build build
+ libinstall: sudo cmake --install bu=
ild
+ ovpnconfig=
ureenv: PKG_CONFIG_PATH=3D$LIBPREFIX/lib/pkgconfig
=
aws-lc:
- =
strategy:
- fai=
l-fast: false
- ma=
trix:
- os: [ubu=
ntu-24.04]
- ssl=
lib: [ awslc ]
- =
build: [ normal, asan ]
- include:
- =
- build: asan
-=
cflags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall =
-fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-f=
rame-pointer -g -O1"
- ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall=
span>
- cc: clang=
span>
- cxx: clang+=
+
- - build: n=
ormal
- cfla=
gs: "-O2 -g"
=
- ldflags: ""
- cc: gcc
- cxx: c++
-
- name: &=
quot;${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}=
"
- runs-on: ${=
{matrix.os}}
- env:<=
/span>
- CFLAGS: ${{ matr=
ix.cflags }}
- LDF=
LAGS: ${{ matrix.ldflags }}
- CC: ${{matrix.cc}}
- CXX: ${{matrix.cxx}}
- UBSAN_OPTIONS: print_stacktrace=3D1
- AWS_LC_INSTALL: /opt/aws-lc<=
br>+ uses: ./.github/workflo=
ws/test-ssllib.yml
+ =
with:
+ libna=
me: aws-lc
+ ovp=
nlibdesc: AWS-LC
# versioning=3Dsemver-coerced
- AWS_LC_REPO: aws/aws-=
lc
- AWS_LC_VERSIO=
N: v1.70.0
-
=
- steps:
- - name: Install dependencies- run: sudo apt update &=
amp;& sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev libl=
z4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3=
-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-d=
ev libnl-genl-3-dev
- =
- name: Restore AWS-LC from cache
- uses: actions/cache@...3010...
- id: aws-lc-cache
- with:
- path: ${{ env.AWS_LC_INSTALL }}
- key: ${{ matrix.o=
s }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }}
- - name: "AWS-LC: checkout&quo=
t;
- if: steps.a=
ws-lc-cache.outputs.cache-hit !=3D 'true'
- uses: actions/checkout@...2998... # v6.=
0.2
- with:
- path: aws-lc
- repository: ${{=
env.AWS_LC_REPO }}
- =
ref: ${{ env.AWS_LC_VERSION }}
- - uses: lukka/get-cmake@...2999... # v4.2.3- - name: "AWS-LC: bu=
ild"
- if: =
steps.aws-lc-cache.outputs.cache-hit !=3D 'true'
- run: |
- mkdir build
- cd build
- cmake -GNinja -DCMAKE_BUILD_TYPE=3DRelea=
se -DCMAKE_INSTALL_PREFIX=3D"${{ env.AWS_LC_INSTALL }}" -DBUILD_S=
HARED_LIBS=3D1 ../
- =
ninja install
- =
working-directory: aws-lc
- - name: Checkout OpenVPN
- uses: actions/checkout@...2998... # v6.0.2
- - name: autoconf
- run: autoreconf -=
fvi
- - name: conf=
igure with AWS-LC
- =
run: |
- O=
PENSSL_CFLAGS=3D"-I${{ env.AWS_LC_INSTALL }}/include" \
- OPENSSL_LIBS=3D"=
-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \
- LDFLAGS=3D"-Wl,-rpath=3D${{=
env.AWS_LC_INSTALL }}/lib" \
- ./configure --with-crypto-library=3Dopenssl- - name: make all<=
br>- run: make -j3<=
br>- - name: Ensure the buil=
d uses AWS-LC
- =
run: |
- ./src=
/openvpn/openvpn --version
- ./src/openvpn/openvpn --version | grep -q "library vers=
ions: AWS-LC"
- =
- name: configure checks
- run: echo 'RUN_SUDO=3D"sudo -E"' >tests/=
t_server_null.rc
- =
- name: make check
- =
run: make -j3 check VERBOSE=3D1
+ ghrepo: aws/aws-lc
+ gitref: v1.70.0
+ libconfigure: cmake -B build -GNinja -DCMAKE=
_BUILD_TYPE=3DRelease -DCMAKE_INSTALL_PREFIX=3D"$LIBPREFIX" -DBUI=
LD_SHARED_LIBS=3D1
+ =
libmake: cmake --build build
+ libinstall: sudo cmake --install build
+ # not ready for --enable-werro=
r
+ ovpnconfigur=
eflags:
diff --git a/.github/workflows/test-ssllib.yml b/.g=
ithub/workflows/test-ssllib.yml
new file mode 100644=
index 0000000..c6a2e44
--- /dev/null
+++ b/.github/workflows/test-ssllib.yml
@@ -0,0 +1,117 =
@@
+name: test_ssllib=
+
+on:
+ workflow_call:
+ inputs:
+ libname:
+ required: true
+ type: string
+ ovpnlibname:
+ type: string
+ default: openssl
+ ovpnlibdesc:
+ required: true
+ type: string
+ ghrepo:
+ required: true
+ type: string
+ gitref:
+ required: true
+ type: string
+ libconfigure:
+ required: true
+ type: string
+ libmake:
+ type: string
+ default: "make -j3"
+ libinstall:
+ type: string
+ default: "sudo make install"=
;
+ ovpnconfigur=
eenv:
+ type: =
string
+ defau=
lt: >-
+ =
OPENSSL_CFLAGS=3D"-I$LIBPREFIX/include"
+ OPENSSL_LIBS=3D"-L$LIBPREFIX/l=
ib -lssl -lcrypto"
+ LDFLAGS=3D"-Wl,-rpath=3D$LIBPREFIX/lib"
<=
span style=3D"color: hsl(120, 100%, 40%);">+ ovpnconfigureflags:
+ type: string
+ default: --enabl=
e-werror --with-openssl-engine=3Dno
+
+job=
s:
+ test_ssllib:
+ strategy:+ fail-fast: false
+ matrix:
<=
span style=3D"color: hsl(120, 100%, 40%);">+ os: [ubuntu-24.04]
+ build: [normal, =
asan]
+ includ=
e:
+ - build=
: asan
+ c=
flags: "-fsanitize=3Daddress -fno-sanitize-recover=3Dall -fno-optimiz=
e-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer =
-g -O1"
+ =
ldflags: -fsanitize=3Daddress -fno-sanitize-recover=3Dall
+ cc: clang
=
+ cxx: clang++
+ - build: normal=
+ cflags:=
"-O2 -g"
+=
ldflags: ""
+ cc: gcc
+ cxx: g++
+
+ =
name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{inputs.l=
ibname}}"
+ r=
uns-on: ${{matrix.os}}
+ env:
+ CF=
LAGS: ${{matrix.cflags}}
+ LDFLAGS: ${{matrix.ldflags}}
+ CC: ${{matrix.cc}}
+ CXX: ${{matrix.cxx}}
+ UBSAN_OPTIONS: print_stacktrace=3D1=
+ LIBPREFIX: /o=
pt/${{inputs.libname}}
+
+ steps:
+ - name: Install dep=
endencies
+ ru=
n: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev =
liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils lib=
tool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
=
+ - name: Restore ${{input=
s.libname}} from cache
+ uses: actions/cache@...3024... # v5.0.5
+ id: ssllib-cache
+ with:
+ path: ${{env.LIBPREFIX}}
=
+ key: ${{matrix.os}}-=
${{inputs.libname}}-${{matrix.build }}-${{inputs.gitref}}
+ - name: "${{inputs.libname=
}}: checkout"
+ =
if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'<=
br>+ uses: actions/check=
out@...2998... # v6.0.2
+ with:
+ =
submodules: recursive
+ path: ${{inputs.libname}}
+ repository: ${{inputs.ghrepo}}+ ref: ${{inputs.git=
ref}}
+ - name: =
"${{inputs.libname}}: configure"
+ if: steps.ssllib-cache.outputs.cache-hit !=
=3D 'true'
+ =
run: ${{inputs.libconfigure}}
+ working-directory: ${{inputs.libname}}
<=
span style=3D"color: hsl(120, 100%, 40%);">+ - name: "${{inputs.l=
ibname}}: build"
+ if: steps.ssllib-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.l=
ibmake}}
+ wor=
king-directory: ${{inputs.libname}}
+ - name: "${{inputs.libname}}: install"
+ if: steps.ssllib=
-cache.outputs.cache-hit !=3D 'true'
+ run: ${{inputs.libinstall}}
+ working-directory: ${{inpu=
ts.libname}}
+ -=
name: Run ldconfig
+=
run: sudo ldconfig
+ - name: "OpenVPN: checkout"
+ uses: actions/checkout@...2998... # =
v6.0.2
+ - name:=
"OpenVPN: autoreconf"
+ run: autoreconf -fvi
+ - name: "OpenVPN: configure"+ run: |
+ ${{inputs.ovpnconfigure=
env}} \
+ ./=
configure --with-crypto-library=3D${{inputs.ovpnlibname}} ${{inputs.ovpncon=
figureflags}}
+ =
- name: "OpenVPN: build"
+ run: make -j3
+ - name: Ensure the build uses ${{inputs.libname}}
+ run: |<=
br>+ ./src/openvpn/ope=
nvpn --version
+ =
./src/openvpn/openvpn --version | grep -q "library versions: ${{i=
nputs.ovpnlibdesc}}"
+ - name: "OpenVPN: configure checks"
+ run: echo 'RUN_SUDO=3D&qu=
ot;sudo -E"' >tests/t_server_null.rc
+ - name: "OpenVPN: make check"<=
/span>
+ run: make -j=
3 check VERBOSE=3D1
diff --git a/renovate.json b/renovate.j=
son
index f9c62c4..809ac3f 100644
--- a/ren=
ovate.json
+++ b/renovate.json
@@ -40,7 +40=
,7 @@
"/^\\.github/workflows/.+\\.ya?=
ml$/"
],
&qu=
ot;matchStrings": [
- "versioning=3D(?<versioning>.*?)\\n\\s*.*?_RE=
PO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*=
?)\\n"
+ =
"versioning=3D(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<=
depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n"
],
"datasourceTem=
plate": "github-tags"
}
<=
span>
To view, visit change 1630. To unsubscribe, or for hel=
p writing mail filters, visit settings.
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a=
518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-Reviewer: uddr <yura.uddr@...277...&=
gt;
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Attention: uddr <yura.uddr@...277...=
>
=
--F7exkaekMtc=--