diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fdd133e346a..3958ef0caee 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -211,18 +211,10 @@ jobs: 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,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all @@ -232,35 +224,30 @@ jobs: 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - name: Set environment + run: | + cat >>$GITHUB_ENV <