From 58f84f0e18063f239fb2a2faa2cb22e5178a5602 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Mon, 8 Jul 2024 11:08:50 -0400
Subject: [PATCH] fixup! Test against kryoptic in CI

---
 .github/workflows/kryoptic.yml | 67 +++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/kryoptic.yml b/.github/workflows/kryoptic.yml
index 5f3fb648..4d734c14 100644
--- a/.github/workflows/kryoptic.yml
+++ b/.github/workflows/kryoptic.yml
@@ -13,6 +13,19 @@ jobs:
     runs-on: ubuntu-22.04
     container: fedora:latest
     steps:
+      - name: Get Date for DNF cache entry
+        id: get-date
+        run: |
+          echo "date=$(/bin/date -u "+%Y%V")" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Restore DNF cache
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            /var/cache/dnf
+          key: ${{ runner.os }}-dnf-${{ steps.get-date.outputs.date }}
+
       - name: Install Dependencies
         run: |
             dnf -y install clang git meson cargo \
@@ -22,18 +35,62 @@ jobs:
               'perl(Module::Load::Conditional)' 'perl(File::Temp)' \
               'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
               'perl(File::Compare)' 'perl(File::Copy)'
+
+      - name: Store DNF cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            /var/cache/dnf
+          key: ${{ runner.os }}-dnf-${{ steps.get-date.outputs.date }}
+
       - name: Checkout Repository
         uses: actions/checkout@v4
+
       - name: Setup Kryoptic
         id: kryoptic_setup
         run: |
           git clone https://github.com/latchset/kryoptic.git
           cd kryoptic
           git submodule update --init
+          echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"
+          echo "OSSLHEAD=${PWD}/.git/modules/openssl/HEAD" >> "$GITHUB_OUTPUT"
+          cd ~
+          echo "TILDE=${PWD}" >> "$GITHUB_OUTPUT"
+          echo ${PWD)
+
+      - name: Restore OpenSSL build
+        uses: actions/cache/restore@v4
+        id: cache
+        with:
+          path: |
+            {{ steps.kryoptic_setup.outputs.KRYOPTIC }}/openssl/
+          key: ${{ runner.os }}-ossl-${{ hashFiles(steps.kryoptic_setup.outputs.OSSLHEAD) }}
+
+      - name: Generate lock file
+        run: |
+          cd ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}
+          cargo generate-lockfile
+
+      - name: Cache Rust dependencies
+        env:
+          KRYOPTIC: ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('kryoptic/**/Cargo.lock') }}
+
+      - name: Build Kryoptic
+        run: |
+          cd ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}
           cargo build
           cargo test | tee testout.log 2>&1
           grep -q "0 failed" testout.log
-          echo "KRYOPTIC=${PWD}" >> "$GITHUB_OUTPUT"
+
       - name: Setup
         run:
           meson setup builddir
@@ -54,3 +111,11 @@ jobs:
             builddir/tests/tmp.kryoptic/p11prov-debug.log
             builddir/tests/tmp.kryoptic/testvars
             builddir/tests/tmp.kryoptic/openssl.cnf
+
+      - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
+        name: Cache OpenSSL build
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}/openssl/
+          key: ${{ runner.os }}-ossl-${{ hashFiles(steps.kryoptic_setup.outputs.OSSLHEAD) }}