From: Darren Tucker Date: Wed, 8 Sep 2021 11:09:49 +0000 (+1000) Subject: Really fix test on OpenSSL 1.1.1 stable. X-Git-Tag: V_8_8_P1~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4565e69ffa2485cff715aa842ea7a350296bfb6;p=thirdparty%2Fopenssh-portable.git Really fix test on OpenSSL 1.1.1 stable. --- diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh index 70a444e4e..c56dfc46c 100755 --- a/.github/setup_ci.sh +++ b/.github/setup_ci.sh @@ -54,6 +54,7 @@ for TARGET in $TARGETS; do openssl-*) INSTALL_OPENSSL=$(echo ${TARGET} | cut -f2 -d-) case ${INSTALL_OPENSSL} in + 1.1.1_stable) INSTALL_OPENSSL="OpenSSL_1_1_1-stable" ;; 1.*) INSTALL_OPENSSL="OpenSSL_$(echo ${INSTALL_OPENSSL} | tr . _)" ;; 3.*) INSTALL_OPENSSL="openssl-${INSTALL_OPENSSL}" ;; esac diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index c8b11087e..84e680dde 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -41,7 +41,7 @@ jobs: - { os: ubuntu-latest, configs: openssl-1.1.1 } - { os: ubuntu-latest, configs: openssl-1.1.1k } - { os: ubuntu-latest, configs: openssl-3.0.0 } - - { os: ubuntu-latest, configs: openssl-1_1_1-stable } # stable branch + - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch - { os: ubuntu-latest, configs: openssl-3.0 } # stable branch - { os: ubuntu-18.04, configs: pam } - { os: ubuntu-18.04, configs: kerberos5 }