From 55710d696bc4571abd52e7d855798e647d995b09 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 15 Feb 2024 11:04:55 +0100 Subject: [PATCH] Move PKCS11 CI job to Debian "bullseye" Fedora images lost PKCS11 tools a long time ago, Debian "bullseye" retains them. --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3748ba8a6c..7f15d7ab29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1137,7 +1137,7 @@ unit:clang:bullseye:amd64: - job: clang:bullseye:amd64 artifacts: true -# Jobs for PKCS#11-enabled GCC builds on Fedora 35 (amd64) +# Jobs for PKCS#11-enabled GCC builds on Debian "bullseye" (amd64) # "--disable-warn-error" ./configure option disables compiler warnings. This # ensures that the job will not fail because of warnings (e.g., array @@ -1147,19 +1147,19 @@ gcc:pkcs11: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so --disable-warn-error" - <<: *fedora_35_amd64_image + EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so --disable-warn-error" + <<: *debian_bullseye_amd64_image <<: *build_job system:gcc:pkcs11: - <<: *fedora_35_amd64_image + <<: *debian_bullseye_amd64_image <<: *system_test_job needs: - job: gcc:pkcs11 artifacts: true unit:gcc:pkcs11: - <<: *fedora_35_amd64_image + <<: *debian_bullseye_amd64_image <<: *unit_test_job needs: - job: gcc:pkcs11