CI: Simplify kryoptic build

Kryoptic supports linking against system OpenSSL, which should be much faster than rebuilding the whole OpenSSL. Signed-off-by: Jakub Jelen <[email protected]>
latchset · Dec 19, 2024 · b2cbaa1 · b2cbaa1
1 parent 6be8f7a
commit b2cbaa1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 37 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -68,14 +68,9 @@ jobs:
 
       - name: Install Dependencies
         run: |
-            dnf -y install clang git meson cargo expect \
-              pkgconf-pkg-config openssl-devel openssl opensc \
-              p11-kit-devel p11-kit-server gnutls-utils \
-              gcc g++ perl-interpreter zlib-devel sqlite-devel \
-              httpd bind9-next softhsm \
-              'perl(Module::Load::Conditional)' 'perl(File::Temp)' \
-              'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
-              'perl(File::Compare)' 'perl(File::Copy)'
+            dnf -y install clang git meson cargo expect pkgconf-pkg-config \
+              openssl-devel openssl opensc p11-kit-devel gnutls-utils \
+              gcc g++ sqlite-devel httpd bind9-next softhsm
 
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -85,17 +80,8 @@ jobs:
         run: |
           git clone https://github.com/latchset/kryoptic.git
           cd kryoptic
-          git submodule update --init
           echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"
 
-      - name: OpenSSL build cache
-        uses: actions/cache@v4
-        id: cache
-        with:
-          path: |
-            kryoptic/openssl/
-          key: ${{ runner.os }}-ossl-${{ hashFiles('kryoptic/.git/modules/openssl/HEAD') }}
-
       - name: Generate lock file
         run: |
           cd kryoptic
@@ -115,7 +101,7 @@ jobs:
       - name: Build Kryoptic
         run: |
           cd kryoptic
-          cargo build --features standard
+          cargo build --features dynamic,standard
 
       - name: Setup, Build and Install pkcs11-provider
         run: |

diff --git a/.github/workflows/kryoptic.yml b/.github/workflows/kryoptic.yml
@@ -28,14 +28,9 @@ jobs:
 
       - name: Install Dependencies
         run: |
-            dnf -y install clang git meson cargo expect \
-              pkgconf-pkg-config openssl-devel openssl opensc \
-              p11-kit-devel p11-kit-server gnutls-utils \
-              gcc g++ perl-interpreter zlib-devel sqlite-devel \
-              'perl(Module::Load::Conditional)' 'perl(File::Temp)' \
-              'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
-              'perl(File::Compare)' 'perl(File::Copy)' \
-              python3-six which
+            dnf -y install clang git meson cargo expect pkgconf-pkg-config \
+              openssl-devel openssl opensc p11-kit-devel gnutls-utils \
+              gcc g++ sqlite-devel python3-six which
 
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -45,17 +40,8 @@ jobs:
         run: |
           git clone https://github.com/latchset/kryoptic.git
           cd kryoptic
-          git submodule update --init
           echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"
 
-      - name: OpenSSL build cache
-        uses: actions/cache@v4
-        id: cache
-        with:
-          path: |
-            kryoptic/openssl/
-          key: ${{ runner.os }}-ossl-${{ hashFiles('kryoptic/.git/modules/openssl/HEAD') }}
-
       - name: Generate lock file
         run: |
           cd kryoptic
@@ -75,8 +61,8 @@ jobs:
       - name: Build Kryoptic
         run: |
           cd kryoptic
-          cargo build --features standard,nssdb
-          cargo test --features standard,nssdb | tee testout.log 2>&1
+          cargo build --features dynamic,standard,nssdb
+          cargo test --features dynamic,standard,nssdb | tee testout.log 2>&1
           grep -q "0 failed" testout.log
 
       - name: Setup