Skip to content

Commit

Permalink
On Centos Stream iskip test if NSS is too old
Browse files Browse the repository at this point in the history
Unfortunately there does not seem to be a real way to skip the test,
this just marks it as pass without doing nothing.
Hopefully we can drop this special case soon as c9s get's a new version
of NSS.

Signed-off-by: Simo Sorce <[email protected]>
  • Loading branch information
simo5 committed Aug 28, 2024
1 parent a402f67 commit afb3551
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ jobs:
pkgconf-pkg-config openssl-devel openssl \
diffutils expect valgrind opensc gnutls-utils
if [ "${{ matrix.token }}" = "softokn" ]; then
dnf -y install nss-softokn nss-tools nss-softokn-devel
dnf -y install nss-softokn nss-tools nss-softokn-devel \
nss-devel
elif [ "${{ matrix.token }}" = "softhsm" ]; then
dnf -y install softhsm p11-kit-devel p11-kit-server
fi
Expand All @@ -55,12 +56,26 @@ jobs:
p11-kit-modules
fi
fi
- name: Check NSS version
id: nss-version-check
run: |
if [ "${{ matrix.name }}" = "centos" ]; then
if [ "${{ matrix.token }}" = "softokn" ]; then
NSSMINVER=`nss-config --version nss | cut -d '.' -f 2`
if [ $NSSMINVER -lt 101 ]; then
echo "skiptest=true" >> $GITHUB_OUTPUT
fi
fi
fi
- name: Checkout Repository
if : ( steps.nss-version-check.outputs.skiptest != 'true' )
uses: actions/checkout@v4
- name: Setup
if : ( steps.nss-version-check.outputs.skiptest != 'true' )
run: |
CC=${{ matrix.compiler }} meson setup builddir
- name: Build and Test
if : ( steps.nss-version-check.outputs.skiptest != 'true' )
run: |
meson compile -C builddir
meson test --num-processes 1 -C builddir
Expand All @@ -74,6 +89,7 @@ jobs:
builddir/tests/tmp.${{ matrix.token }}/testvars
builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
- name: Run tests with valgrind
if : ( steps.nss-version-check.outputs.skiptest != 'true' )
run: |
if [ "${{ matrix.compiler }}" = "gcc" ]; then
meson test --num-processes 1 -C builddir --setup=valgrind
Expand Down

0 comments on commit afb3551

Please sign in to comment.