Merge pull request wolfSSL#696 from ejohnstown/update-test

OS Check Test
jefferyq2 · Oct 29, 2024 · 5a715b0 · 5a715b0
1 parent e5528bd
commit 5a715b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/kyber.yml b/.github/workflows/kyber.yml
@@ -72,12 +72,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

diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml
@@ -27,6 +27,11 @@ jobs:
 
   build_wolfssl:
     needs: create_matrix
+env:
+  WOLFSSL_REF: v5.7.0-stable
+
+jobs:
+  build_wolfssl:
     strategy:
       fail-fast: false
       matrix:
@@ -47,12 +52,16 @@ jobs:
       - name: debug
         run: echo wolfssl version ${{ matrix.wolfssl }}
 
+          key: wolfssh-os-check-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
+          lookup-only: true
+
       - name: Checkout, build, and install wolfssl
         if: steps.cache-wolfssl.outputs.cache-hit != 'true'
         uses: wolfSSL/actions-build-autotools-project@v1
         with:
           repository: wolfssl/wolfssl
           ref: ${{ matrix.wolfssl }}
+          ref: ${{ env.WOLFSSL_REF }}
           path: wolfssl
           configure: --enable-all
           check: false
@@ -77,12 +86,14 @@ jobs:
     name: Build wolfssh
     runs-on: ${{ matrix.os }}
     timeout-minutes: 4
+    needs: build_wolfssl
     steps:
       - name: Checking cache for wolfssl
         uses: actions/cache@v4
         with:
           path: build-dir/
           key: wolfssh-os-check-wolfssl-${{ matrix.wolfssl }}-${{ matrix.os }}
+          key: wolfssh-os-check-wolfssl-${{ env.WOLFSSL_REF }}-${{ matrix.os }}
           fail-on-cache-miss: true
 
       - name: Checkout, build, and test wolfssh