Skip to content

Commit b198fdd

Browse files
committed
.github/workflows/test.yml: update test-openssls
Changes include: - Test against OpenSSL 3.5.0 and LibreSSL 4.1.0. - Run "rake test" and "rake test_fips" in the same job so that we can avoid compiling the same OpenSSL version twice. - Use the "no-tests" option when compiling OpenSSL 3.0 or later. This disables compiling OpenSSL's test suite which we do not run.
1 parent 6dfb8df commit b198fdd

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,21 @@ jobs:
6363
openssl:
6464
# https://openssl-library.org/source/
6565
- openssl-1.1.1w # EOL 2023-09-11, still used by RHEL 8 and Ubuntu 20.04
66-
- openssl-3.0.16 # Supported until 2026-09-07
66+
- openssl-3.0.16 # Supported until 2026-09-07 (LTS)
6767
- openssl-3.1.8 # EOL 2025-03-14
6868
- openssl-3.2.4 # Supported until 2025-11-23
6969
- openssl-3.3.3 # Supported until 2026-04-09
7070
- openssl-3.4.1 # Supported until 2026-10-22
71+
- openssl-3.5.0 # Supported until 2030 (LTS)
7172
- openssl-master
7273
# http://www.libressl.org/releases.html
73-
- libressl-3.9.2 # Supported until 2025-04-05
74+
- libressl-3.9.2 # EOL 2025-04-05
7475
- libressl-4.0.0 # Supported until 2025-10-08
76+
- libressl-4.1.0 # Supported until 2026-04-28
7577
# https://github.com/aws/aws-lc/tags
7678
- aws-lc-latest
7779
include:
78-
- { name-extra: 'with fips provider', openssl: openssl-3.0.16, fips-enabled: true }
79-
- { name-extra: 'with fips provider', openssl: openssl-3.1.8, fips-enabled: true }
80-
- { name-extra: 'with fips provider', openssl: openssl-3.2.4, fips-enabled: true }
81-
- { name-extra: 'with fips provider', openssl: openssl-3.3.3, fips-enabled: true }
82-
- { name-extra: 'with fips provider', openssl: openssl-3.4.1, fips-enabled: true }
83-
- { name-extra: 'with fips provider', openssl: openssl-master, fips-enabled: true }
84-
- { name-extra: 'without legacy provider', openssl: openssl-3.4.1, append-configure: 'no-legacy' }
80+
- { name-extra: 'without legacy provider', openssl: openssl-3.5.0, append-configure: 'no-legacy' }
8581
- { openssl: aws-lc-latest, skip-warnings: true }
8682
steps:
8783
- name: repo checkout
@@ -113,7 +109,7 @@ jobs:
113109
OPENSSL_COMMIT=${{ matrix.openssl == 'openssl-master' && 'master' || matrix.openssl }}
114110
git clone -b $OPENSSL_COMMIT --depth 1 https://github.com/openssl/openssl.git .
115111
echo "Git commit: $(git rev-parse HEAD)"
116-
./Configure --prefix=$HOME/openssl --libdir=lib enable-fips ${{ matrix.append-configure }}
112+
./Configure --prefix=$HOME/openssl --libdir=lib enable-fips no-tests ${{ matrix.append-configure }}
117113
make -j4 && make install_sw && make install_fips
118114
;;
119115
libressl-*)
@@ -150,20 +146,16 @@ jobs:
150146
- name: rake compile
151147
run: bundle exec rake compile -- --with-openssl-dir=$HOME/openssl
152148

153-
- name: setup OpenSSL config file for fips
154-
run: |
155-
sed -e "s|OPENSSL_DIR|$HOME/openssl|" tool/openssl_fips.cnf.tmpl > tmp/openssl_fips.cnf
156-
echo "OPENSSL_CONF=$(pwd)/tmp/openssl_fips.cnf" >> $GITHUB_ENV
157-
if: matrix.fips-enabled
158-
159149
- name: rake test
160150
run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
161151
timeout-minutes: 5
162-
if: ${{ !matrix.fips-enabled }}
163152

164153
# Run only the passing tests on the FIPS module as a temporary workaround.
165154
# TODO Fix other tests, and run all the tests on FIPS module.
166155
- name: rake test_fips
167-
run: bundle exec rake test_fips TESTOPTS="-v --no-show-detail-immediately"
156+
run: |
157+
sed -e "s|OPENSSL_DIR|$HOME/openssl|" tool/openssl_fips.cnf.tmpl > tmp/openssl_fips.cnf
158+
export OPENSSL_CONF=$(pwd)/tmp/openssl_fips.cnf
159+
bundle exec rake test_fips TESTOPTS="-v --no-show-detail-immediately"
168160
timeout-minutes: 5
169-
if: matrix.fips-enabled
161+
if: ${{ startsWith(matrix.openssl, 'openssl-3') || matrix.openssl == 'openssl-master' }}

0 commit comments

Comments
 (0)