From: Neil Horman Date: Sat, 25 Oct 2025 13:11:59 +0000 (-0400) Subject: exclude no-docs from 3.0 build in openssh interop testing X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~279 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3673c861a37915cbafc2d71adfc49321f06b9914;p=thirdparty%2Fopenssl.git exclude no-docs from 3.0 build in openssh interop testing The interop CI job is failing because we attempt to configure openssl with no-docs in the 3.0 branch, which that stable branch doesn't support. Exclude no-docs from 3.0 builds in this CI job. Fixes openssl/project#1695 Reviewed-by: Tim Hudson Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28993) --- diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml index ea3931dd206..aa4d9967636 100644 --- a/.github/workflows/interop-tests.yml +++ b/.github/workflows/interop-tests.yml @@ -59,13 +59,13 @@ jobs: fail-fast: false matrix: branch: [ - { openssl: 'master', openssh: 'openssl-master'}, - { openssl: 'openssl-3.6', openssh: 'openssl-3.6'}, - { openssl: 'openssl-3.5', openssh: 'openssl-3.5'}, - { openssl: 'openssl-3.4', openssh: 'openssl-3.4'}, - { openssl: 'openssl-3.3', openssh: 'openssl-3.3'}, - { openssl: 'openssl-3.2', openssh: 'openssl-3.2'}, - { openssl: 'openssl-3.0', openssh: 'openssl-3.0'} + { openssl: 'master', openssh: 'openssl-master', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.6', openssh: 'openssl-3.6', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.5', openssh: 'openssl-3.5', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.4', openssh: 'openssl-3.4', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.3', openssh: 'openssl-3.3', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.2', openssh: 'openssl-3.2', openssl_config: 'no-docs'}, + { openssl: 'openssl-3.0', openssh: 'openssl-3.0', openssl_config: ''} ] runs-on: ubuntu-latest env: @@ -79,7 +79,7 @@ jobs: ref: ${{ matrix.branch.openssl }} fetch-depth: 1 - name: config - run: ./config --banner=Configured -fPIC --prefix=/opt/openssl no-docs shared -Wl,-rpath,/opt/openssl/lib64 && perl configdata.pm --dump + run: ./config --banner=Configured -fPIC --prefix=/opt/openssl ${{ matrix.openssl_config }} shared -Wl,-rpath,/opt/openssl/lib64 && perl configdata.pm --dump - name: make run: | make -s -j4