From: Frank Lichtenheld <fr...@lichtenheld.com> Reduce redundant configuration.
Change-Id: Ie922ce67685228eb7043749a7f1a61a33be678d2 Signed-off-by: Frank Lichtenheld <fr...@lichtenheld.com> Acked-by: Arne Schwabe <arne-open...@rfc2549.org> Acked-by: Yuriy Darnobyt <yura.u...@gmail.com> Signed-off-by: Gert Doering <g...@greenie.muc.de> Acked-by: Gert Doering <g...@greenie.muc.de> (cherry picked from commit 33a700d61e5b1a724b00f17fa0ed75d694e2823a) --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/782 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <g...@greenie.muc.de> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e4959ba..d930197 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -192,18 +192,10 @@ strategy: fail-fast: false matrix: - ssllib: [ openssl11, openssl3, libressl] - build: [ normal, asan ] + ssllib: [openssl@1.1, openssl@3, libressl] + build: [normal, asan] os: [macos-13, macos-14, macos-15] include: - # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/ - # on ARM instead of /usr/local/ - - os: macos-13 - homebrew: /usr/local/opt - - os: macos-14 - homebrew: /opt/homebrew/opt - - os: macos-15 - homebrew: /opt/homebrew/opt - build: asan cflags: "-fsanitize=address -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" ldflags: -fsanitize=address @@ -213,35 +205,30 @@ cflags: "-O2 -g" ldflags: "" configureflags: "" - - ssllib: openssl11 - libdir: openssl@1.1 - configuressllib: "" - - ssllib: openssl3 - libdir: openssl@3 - configuressllib: "" - - ssllib: libressl - libdir: libressl - configuressllib: "--with-openssl-engine=no" runs-on: ${{matrix.os}} - name: "${{matrix.os}} - ${{matrix.libdir}} - ${{matrix.build}}" + name: "${{matrix.os}} - ${{matrix.ssllib}} - ${{matrix.build}}" env: CFLAGS: ${{ matrix.cflags }} LDFLAGS: ${{ matrix.ldflags }} - OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include" - OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl" - LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include" - LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2" UBSAN_OPTIONS: print_stacktrace=1 steps: - name: Install dependencies - run: brew install openssl@1.1 openssl@3 lzo lz4 man2html cmocka libtool automake autoconf libressl + run: brew install ${{matrix.ssllib}} lzo lz4 man2html cmocka libtool automake autoconf - name: Checkout OpenVPN uses: actions/checkout@v4 + - name: Set environment + run: | + cat >>$GITHUB_ENV <<EOF; + OPENSSL_CFLAGS=-I$(brew --prefix ${{matrix.ssllib}})/include + OPENSSL_LIBS=-L$(brew --prefix ${{matrix.ssllib}})/lib -lcrypto -lssl + LZO_CFLAGS=-I$(brew --prefix lzo)/include + LZO_LIBS=-L$(brew --prefix lzo)/lib -llzo2 + EOF - name: autoconf run: autoreconf -fvi - name: configure - run: ./configure --enable-werror ${{matrix.configureflags}} ${{matrix.configuressllib}} + run: ./configure --enable-werror ${{matrix.configureflags}} - name: make all run: make -j4 - name: make check _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
