Skip to content

Commit

Permalink
ci: Run tests also against CentOS 9 (OpenSSL 3.0)
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Jelen <[email protected]>
  • Loading branch information
Jakuje committed Apr 5, 2024
1 parent da6c6af commit 451eca0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ jobs:
strategy:
fail-fast: false
matrix:
name: [fedora, debian]
name: [fedora, debian, centos]
compiler: [gcc, clang]
token: [softokn, softhsm]
include:
- name: fedora
container: fedora:latest
- name: debian
container: debian:sid
- name: centos
container: quay.io/centos/centos:stream9
container: ${{ matrix.container }}
steps:
- name: Install Dependencies
run: |
if [ -f /etc/fedora-release ]; then
if [ -f /etc/redhat-release ]; then
dnf -y install git ${{ matrix.compiler }} automake libtool \
pkgconf-pkg-config autoconf-archive openssl-devel openssl \
diffutils expect valgrind
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/distcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@ jobs:
strategy:
fail-fast: false
matrix:
name: [fedora, debian]
name: [fedora, debian, centos]
include:
- name: fedora
container: fedora:latest
- name: debian
container: debian:sid
- name: centos
container: quay.io/centos/centos:stream9
container: ${{ matrix.container }}
steps:
- name: Install Dependencies
run: |
if [ -f /etc/fedora-release ]; then
if [ -f /etc/redhat-release ]; then
dnf -y install git gcc automake libtool expect \
pkgconf-pkg-config autoconf-archive openssl-devel openssl xz \
nss-softokn nss-tools nss-softokn-devel \
Expand Down
4 changes: 2 additions & 2 deletions tests/setup-softhsm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ echo "${ECPRI2URI}"
echo "${ECCRT2URI}"
echo ""

if [ -f /etc/fedora-release ]; then
title PARA "explicit EC unsupported on Fedora"
if [ -f /etc/redhat-release ]; then
title PARA "explicit EC unsupported on Fedora/EL"
else
title PARA "generate explicit EC key pair"
KEYID='0007'
Expand Down
4 changes: 2 additions & 2 deletions tests/tecxc
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Copyright (C) 2023 Simo Sorce <[email protected]>
# SPDX-License-Identifier: Apache-2.0

# On Fedora they completely removed support for explicit EC from libcrypto,
# On Fedora/EL completely removed support for explicit EC from libcrypto,
# so skip the test completely
if [ -f /etc/fedora-release ]; then
if [ -f /etc/redhat-release ]; then
exit 0
fi

Expand Down

0 comments on commit 451eca0

Please sign in to comment.