Kyber Testing

1. Switch to using variables for the versions.
2. Updated cache use per recommondations.
3. Renamed the cached items with "kyber" in the name.
pull/692/head
John Safranek 2024-05-16 09:03:53 -07:00
parent 19e39d9491
commit 8da722e0ec
1 changed files with 19 additions and 23 deletions

View File

@ -6,6 +6,10 @@ on:
pull_request: pull_request:
branches: [ '*' ] branches: [ '*' ]
env:
LIBOQS_REF: 0.10.0
WOLFSSL_REF: v5.7.0-stable
jobs: jobs:
build_liboqs: build_liboqs:
name: Build liboqs name: Build liboqs
@ -13,11 +17,11 @@ jobs:
timeout-minutes: 4 timeout-minutes: 4
steps: steps:
- name: Checking cache for liboqs - name: Checking cache for liboqs
uses: actions/cache/restore@v4 uses: actions/cache@v4
id: cache-liboqs id: cache-liboqs
with: with:
path: opt/liboqs/ path: opt/liboqs/
key: wolfssh-liboqs-0.10.0-${{ runner.os }} key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ runner.os }}
lookup-only: true lookup-only: true
- name: Checkout liboqs - name: Checkout liboqs
@ -25,7 +29,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: open-quantum-safe/liboqs repository: open-quantum-safe/liboqs
ref: 0.10.0 ref: ${{ env.LIBOQS_REF }}
path: liboqs path: liboqs
- name: Build and install liboqs - name: Build and install liboqs
@ -38,24 +42,17 @@ jobs:
make make
make install make install
- name: Stash liboqs in cache
if: steps.cache-liboqs.outputs.cache-hit != 'true'
uses: actions/cache/save@v4
with:
path: opt/liboqs/
key: wolfssh-liboqs-0.10.0-${{ runner.os }}
build_wolfssl: build_wolfssl:
name: Build wolfssl name: Build wolfssl
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 4 timeout-minutes: 4
steps: steps:
- name: Checking cache for wolfssl - name: Checking cache for wolfssl
uses: actions/cache/restore@v4 uses: actions/cache@v4
id: cache-wolfssl id: cache-wolfssl
with: with:
path: opt/wolfssl/ path: opt/wolfssl/
key: wolfssh-wolfssl-v5.7.0-stable-${{ runner.os }} key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ runner.os }}
lookup-only: true lookup-only: true
- name: Checkout, build, and install wolfssl - name: Checkout, build, and install wolfssl
@ -63,18 +60,17 @@ jobs:
uses: wolfSSL/actions-build-autotools-project@v1 uses: wolfSSL/actions-build-autotools-project@v1
with: with:
repository: wolfssl/wolfssl repository: wolfssl/wolfssl
ref: v5.7.0-stable ref: ${{ env.WOLFSSL_REF }}
path: wolfssl path: wolfssl
configure: --prefix=${{ github.workspace }}/opt/wolfssl --enable-wolfssh --enable-cryptonly --disable-examples --disable-crypttests configure: --enable-wolfssh --enable-cryptonly --disable-examples --disable-crypttests
check: false check: false
install: true install: true
- name: Stash wolfssl in cache - shell: bash
if: steps.cache-wolfssl.outputs.cache-hit != 'true' if: steps.cache-wolfssl.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 run: |
with: mkdir -p opt
path: opt/wolfssl/ mv build-dir opt/wolfssl
key: wolfssh-wolfssl-v5.7.0-stable-${{ runner.os }}
build_wolfssh: build_wolfssh:
name: Build wolfssh name: Build wolfssh
@ -83,17 +79,17 @@ jobs:
needs: [build_wolfssl, build_liboqs] needs: [build_wolfssl, build_liboqs]
steps: steps:
- name: Checking cache for liboqs - name: Checking cache for liboqs
uses: actions/cache/restore@v4 uses: actions/cache@v4
with: with:
path: opt/liboqs/ path: opt/liboqs/
key: wolfssh-liboqs-0.10.0-${{ runner.os }} key: wolfssh-kyber-liboqs-${{ env.LIBOQS_REF }}-${{ runner.os }}
fail-on-cache-miss: true fail-on-cache-miss: true
- name: Checking cache for wolfssl - name: Checking cache for wolfssl
uses: actions/cache/restore@v4 uses: actions/cache@v4
with: with:
path: opt/wolfssl/ path: opt/wolfssl/
key: wolfssh-wolfssl-v5.7.0-stable-${{ runner.os }} key: wolfssh-kyber-wolfssl-${{ env.WOLFSSL_REF }}-${{ runner.os }}
fail-on-cache-miss: true fail-on-cache-miss: true
- name: Checkout, build, and test wolfssh - name: Checkout, build, and test wolfssh