Change in openvpn[master]: GHA: Factor out building SSL libs to a reusable workflow
A message that is not in the archive (sent off-list or not yet received): gerrit.1776685712000.I3d89016ccae297cfa596897c11a518f1ffbe3dc8@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
to review the following change.
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.
---
M .github/workflows/build.yaml
A .github/workflows/test-ssllib.yml
M renovate.json
3 files changed, 152 insertions(+), 313 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/1630/1
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +114 -0
114 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
to look at the new patch set (#2).
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.
---
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/2
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Attention is currently required from: flichtenheld, plaisthos.
uddr has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email )
Change subject: GHA: Factor out building SSL libs to a reusable workflow
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 20 Apr 2026 14:22:22 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH v2 1/1 GHA: Factor out building SSL libs to a reusable workflow
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
We amassed a lot of code duplication there. Make it easier to track the differences between the libraries.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
This mail reflects revision 2 of this Change.
Acked-by according to Gerrit (reflected above):
Yuriy Darnobyt <[email protected]...>
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
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=email
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~ChecksSubmitRule 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.
---
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
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: uddr <[email protected]...>
Attention is currently required from: flichtenheld, plaisthos.
uddr has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email )
Change subject: GHA: Factor out building SSL libs to a reusable workflow
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 20 Apr 2026 14:45:17 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH v3 1/1 GHA: Factor out building SSL libs to a reusable workflow
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
We amassed a lot of code duplication there. Make it easier to track the differences between the libraries.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
This mail reflects revision 3 of this Change.
Acked-by according to Gerrit (reflected above):
Yuriy Darnobyt <[email protected]...>
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
[Openvpn-devel] [PATCH applied] Re: GHA: Factor out building SSL libs to a reusable workflow
I still have no idea what this is all about, but having less duplication of code/rules is generally a good thing :-) - tested both branches in my GH repo, all green...
Your patch has been applied to the master and release/2.7 branch ("long-term maintenance of test/build infrastructure").
commit 8485518dce6b7ebeda6295fcdf3bc7476b7b9117 (master) commit 66be31fe491f5f6ff85ef135272bf2b6f064a9b5 (release/2.7)
Author: Frank Lichtenheld Date: Mon Apr 20 18:07:27 2026 +0200
GHA: Factor out building SSL libs to a reusable workflow
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Yuriy Darnobyt <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36686.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#4) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by uddr
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.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36686.html
---
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/4
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email )
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.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1630
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg36686.html
---
M .github/workflows/build.yaml
A .github/workflows/test-ssllib.yml
M renovate.json
3 files changed, 155 insertions(+), 313 deletions(-)
.github/workflows/build.yaml +37 -312
@@ -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=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + uses: ./.github/workflows/test-ssllib.yml + with: + libname: libressl + ovpnlibdesc: LibreSSL # versioning=semver-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=--no-single-branch ./autogen.sh && ./configure --prefix=$LIBPREFIX" - steps: - - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # 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 != 'true' - env: - LIBRESSL_GIT_OPTIONS: "--no-single-branch" - run: ./autogen.sh - working-directory: libressl - - name: "libressl: configure" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: ./configure --prefix=${{ env.LIBRESSL_INSTALL }} - working-directory: libressl - - name: "libressl: make all" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: libressl - - name: "libressl: make install" - if: steps.libressl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: libressl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.LIBRESSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.LIBRESSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.LIBRESSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: LibreSSL" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 - - openssl: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [openssl] - build: [ normal, asan ] - configureflags: ["--with-openssl-engine=no"] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}} - 4.0" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 + openssl4: + uses: ./.github/workflows/test-ssllib.yml + with: + libname: openssl + ovpnlibdesc: OpenSSL 4. # versioning=semver-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-dev 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/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: openssl - repository: ${{ env.OPENSSL_REPO }} - ref: ${{ env.OPENSSL_VERSION }} - - name: "openssl: configure" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: ./Configure --prefix=${{ env.OPENSSL_INSTALL }} --libdir=${{ env.OPENSSL_INSTALL }}/lib --openssldir=${{ env.OPENSSL_INSTALL }} -g - working-directory: openssl - - name: "openssl: make all" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: make -j3 - working-directory: openssl - - name: "openssl: make install" - if: steps.openssl-cache.outputs.cache-hit != 'true' - run: sudo make install - working-directory: openssl - - name: "ldconfig" - run: sudo ldconfig - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: | - OPENSSL_CFLAGS="-I${{ env.OPENSSL_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.OPENSSL_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.OPENSSL_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl --enable-werror ${{matrix.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: OpenSSL 4.0" - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: openssl/openssl + gitref: openssl-4.0.0-beta1 + libconfigure: ./Configure --prefix=$LIBPREFIX --libdir=$LIBPREFIX/lib --openssldir=$LIBPREFIX -g mbedtls4: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [mbedtls4] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - UBSAN_OPTIONS: print_stacktrace=1 - PKG_CONFIG_PATH: /opt/mbedtls4/lib/pkgconfig + uses: ./.github/workflows/test-ssllib.yml + with: + libname: mbedtls + ovpnlibname: mbedtls + ovpnlibdesc: mbed TLS 4. # versioning=semver-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-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - - name: Restore mbed TLS from cache - uses: actions/[email protected]... - 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 != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: mbedtls - submodules: recursive - repository: ${{ env.MBEDTLS_REPO }} - ref: ${{ env.MBEDTLS_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "mbedtls: cmake" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake -B build -DCMAKE_INSTALL_PREFIX=${{ env.MBEDTLS_INSTAL }} - working-directory: mbedtls - - name: "mbedtls: cmake --build" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: cmake --build build - working-directory: mbedtls - - name: "mbedtls: cmake --install" - if: steps.mbedtls-cache.outputs.cache-hit != 'true' - run: sudo cmake --install build - working-directory: mbedtls - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure - run: ./configure --with-crypto-library=mbedtls --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: mbed TLS 4." - - name: configure checks - run: echo 'RUN_SUDO="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: Mbed-TLS/mbedtls + gitref: v4.0.0 + libconfigure: cmake -B build -DCMAKE_INSTALL_PREFIX=$LIBPREFIX + libmake: cmake --build build + libinstall: sudo cmake --install build + ovpnconfigureenv: PKG_CONFIG_PATH=$LIBPREFIX/lib/pkgconfig aws-lc: - strategy: - fail-fast: false - matrix: - os: [ubuntu-24.04] - ssllib: [ awslc ] - build: [ normal, asan ] - include: - - build: asan - cflags: "-fsanitize=address -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" - ldflags: -fsanitize=address -fno-sanitize-recover=all - cc: clang - cxx: clang++ - - build: normal - cflags: "-O2 -g" - ldflags: "" - cc: gcc - cxx: c++ - - name: "${{matrix.cc}} ${{matrix.build}} - ${{matrix.os}} - ${{matrix.ssllib}}" - runs-on: ${{matrix.os}} - env: - CFLAGS: ${{ matrix.cflags }} - LDFLAGS: ${{ matrix.ldflags }} - CC: ${{matrix.cc}} - CXX: ${{matrix.cxx}} - UBSAN_OPTIONS: print_stacktrace=1 - AWS_LC_INSTALL: /opt/aws-lc + uses: ./.github/workflows/test-ssllib.yml + with: + libname: aws-lc + ovpnlibdesc: AWS-LC # versioning=semver-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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-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/[email protected]... - id: aws-lc-cache - with: - path: ${{ env.AWS_LC_INSTALL }} - key: ${{ matrix.os }}-aws-lc-${{matrix.build }}-${{ env.AWS_LC_VERSION }} - - name: "AWS-LC: checkout" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - uses: actions/[email protected]... # v6.0.2 - with: - path: aws-lc - repository: ${{ env.AWS_LC_REPO }} - ref: ${{ env.AWS_LC_VERSION }} - - uses: lukka/[email protected]... # v4.2.3 - - name: "AWS-LC: build" - if: steps.aws-lc-cache.outputs.cache-hit != 'true' - run: | - mkdir build - cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${{ env.AWS_LC_INSTALL }}" -DBUILD_SHARED_LIBS=1 ../ - ninja install - working-directory: aws-lc - - name: Checkout OpenVPN - uses: actions/[email protected]... # v6.0.2 - - name: autoconf - run: autoreconf -fvi - - name: configure with AWS-LC - run: | - OPENSSL_CFLAGS="-I${{ env.AWS_LC_INSTALL }}/include" \ - OPENSSL_LIBS="-L${{ env.AWS_LC_INSTALL }}/lib -lssl -lcrypto" \ - LDFLAGS="-Wl,-rpath=${{ env.AWS_LC_INSTALL }}/lib" \ - ./configure --with-crypto-library=openssl - - 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="sudo -E"' >tests/t_server_null.rc - - name: make check - run: make -j3 check VERBOSE=1 + ghrepo: aws/aws-lc + gitref: v1.70.0 + libconfigure: cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$LIBPREFIX" -DBUILD_SHARED_LIBS=1 + libmake: cmake --build build + libinstall: sudo cmake --install build + # not ready for --enable-werror + ovpnconfigureflags:
.github/workflows/test-ssllib.yml new file +117 -0
117 lines not on this page · raw message
renovate.json +1 -1
@@ -40,7 +40,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "versioning=(?<versioning>.*?)\\n\\s*.*?_REPO:\\s*(?<depName>.*?)\\n\\s*.*?_VERSION:\\s*(?<currentValue>.*?)\\n" + "versioning=(?<versioning>.*?)\\n\\s*ghrepo:\\s*(?<depName>.*?)\\n\\s*gitrepo:\\s*(?<currentValue>.*?)\\n" ], "datasourceTemplate": "github-tags" }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1630?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I3d89016ccae297cfa596897c11a518f1ffbe3dc8
Gerrit-Change-Number: 1630
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: uddr <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>