From deea4edfb70e305e235cb9da28574ba42f31e197 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Fri, 17 May 2024 16:27:48 -0700
Subject: [PATCH] Update Test

1. Change kyber test to use the cache naming in the other test.
2. Remove moving wolfSSL to another directory. Clears a bunch of
   warnings.
3. Build liboqs to install in the same directory as wolfSSL.
---
 .github/workflows/kyber.yml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/kyber.yml b/.github/workflows/kyber.yml
index b2b02367b..a950ebc29 100644
--- a/.github/workflows/kyber.yml
+++ b/.github/workflows/kyber.yml
@@ -9,19 +9,20 @@ on:
 env:
   LIBOQS_REF: 0.10.0
   WOLFSSL_REF: v5.7.0-stable
+  OS_REF: ubuntu-latest
 
 jobs:
   build_liboqs:
     name: Build liboqs
-    runs-on: ubuntu-latest
+    runs-on: ${{ env.OS_REF }}
     timeout-minutes: 4
     steps:
       - name: Checking cache for liboqs
         uses: actions/cache@v4
         id: cache-liboqs
         with:
-          path: opt/liboqs/
-          key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ runner.os }}
+          path: build-dir/
+          key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ env.OS_REF }}
           lookup-only: true
 
       - name: Checkout liboqs
@@ -38,21 +39,21 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/opt/liboqs -DOQS_MINIMAL_BUILD=KEM_kyber_512 -DOQS_USE_OPENSSL=0 ..
+          cmake -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build-dir -DOQS_MINIMAL_BUILD=KEM_kyber_512 -DOQS_USE_OPENSSL=0 ..
           make
           make install
 
   build_wolfssl:
     name: Build wolfssl
-    runs-on: ubuntu-latest
+    runs-on: ${{ env.OS_REF }}
     timeout-minutes: 4
     steps:
       - name: Checking cache for wolfssl
         uses: actions/cache@v4
         id: cache-wolfssl
         with:
-          path: opt/wolfssl/
-          key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ runner.os }}
+          path: build-dir/
+          key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ env.OS_REF }}
           lookup-only: true
 
       - name: Checkout, build, and install wolfssl
@@ -66,12 +67,6 @@ jobs:
           check: false
           install: true
 
-      - shell: bash
-        if: steps.cache-wolfssl.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p opt
-          mv build-dir opt/wolfssl
-
   build_wolfssh:
     name: Build wolfssh
     runs-on: ubuntu-latest
@@ -81,15 +76,15 @@ jobs:
       - name: Checking cache for liboqs
         uses: actions/cache@v4
         with:
-          path: opt/liboqs/
-          key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ runner.os }}
+          path: build-dir/
+          key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ env.OS_REF }}
           fail-on-cache-miss: true
 
       - name: Checking cache for wolfssl
         uses: actions/cache@v4
         with:
-          path: opt/wolfssl/
-          key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ runner.os }}
+          path: build-dir/
+          key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ env.OS_REF }}
           fail-on-cache-miss: true
 
       - name: Checkout, build, and test wolfssh
@@ -97,5 +92,5 @@ jobs:
         with:
           repository: wolfssl/wolfssh
           path: wolfssh
-          configure: --with-liboqs LDFLAGS="-L${{ github.workspace }}/opt/liboqs/lib -L${{ github.workspace }}/opt/wolfssl/lib" CPPFLAGS="-I${{ github.workspace }}/opt/liboqs/include -I${{ github.workspace }}/opt/wolfssl/include"
+          configure: --with-liboqs=${{ github.workspace }}/build-dir --with-wolfssl=${{ github.workspace }}/build-dir
           check: true