Commit e63856ee6a for openssl.org
commit e63856ee6a5747143f730c5c5e8764e8eaf71398
Author: Dmitry Misharov <dmitry@openssl.org>
Date: Mon Mar 16 08:34:55 2026 +0100
OpenSSH interop tests job refactoring
* split openssh interop tests job into more steps
* remove openssl build step, it's built in setup_ci.sh
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Tue Mar 17 16:57:05 2026
(Merged from https://github.com/openssl/openssl/pull/30445)
diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml
index a9fbc09c27..e26e0d9635 100644
--- a/.github/workflows/interop-tests.yml
+++ b/.github/workflows/interop-tests.yml
@@ -73,7 +73,6 @@ jobs:
{ 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
@@ -82,28 +81,24 @@ jobs:
TEST_SSH_UNSAFE_PERMISSIONS: 1
TEST_SSH_HOSTBASED_AUTH: yes
steps:
+ - name: install dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get -yq install autoconf zlib1g-dev
- uses: actions/checkout@v6
with:
persist-credentials: false
- ref: ${{ matrix.branch.openssl }}
+ repository: openssh/openssh-portable
fetch-depth: 1
- - name: config
- run: ./config --banner=Configured -fPIC --prefix=/opt/openssl ${{ matrix.openssl_config }} shared -Wl,-rpath,/opt/openssl/lib64 && perl configdata.pm --dump
+ - name: setup ci
+ run: sh ./.github/setup_ci.sh ${{ matrix.branch.openssh }} ubuntu-latest
+ - name: autoreconf
+ run: autoreconf
+ - name: configure
+ run: sh ./.github/configure.sh ${{ matrix.branch.openssh }}
- name: make
run: |
- make -s -j4
- make -s -j4 install_sw
- - name: install dependencies of openssh
- run: |
- sudo apt-get update
- sudo apt-get -yq install autoconf zlib1g-dev
- - name: run openssh
- run: |
- git clone --branch master --depth 1 https://github.com/openssh/openssh-portable.git
- cd openssh-portable
- sh ./.github/setup_ci.sh ${{ matrix.branch.openssh }} ubuntu-latest
- autoreconf
- sh ./.github/configure.sh ${{ matrix.branch.openssh }}
make clean
make -s -j4
- sh ./.github/run_test.sh
+ - name: run tests
+ run: sh ./.github/run_test.sh