From e84ecc322ae64da689ada87f16d9ecb097ffc208 Mon Sep 17 00:00:00 2001 From: Spencer Wilson <spencer.wilson@uwaterloo.ca> Date: Mon, 16 Dec 2024 12:11:16 -0500 Subject: [PATCH] ci: Fix OpenSSL path, add repository_dispatch trigger Add a repository_dispatch trigger to CI. Additionally build against latest liboqs commit in CI. Fix path to OpenSSL for macos-latest in GitHub Actions. Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca> --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28538c3f3c..000109e175 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -on: [push, pull_request, merge_group] +on: [push, pull_request, merge_group, repository_dispatch] name: Continuous integration @@ -15,6 +15,9 @@ jobs: - stable - beta - nightly + liboqs: + - pin + - main env: # 20 MiB stack RUST_MIN_STACK: 20971520 @@ -24,6 +27,10 @@ jobs: with: submodules: true + - name: Update liboqs to latest main + if: matrix.liboqs == 'main' + run: git submodule update --remote + - name: Set stack size if: startsWith(matrix.os, 'windows') run: echo "RUSTFLAGS=-C link-arg=/STACK:20971520" >> $env:GITHUB_ENV @@ -45,7 +52,7 @@ jobs: - name: Set OPENSSL_ROOT_DIR if: startsWith(matrix.os, 'macos') - run: echo "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1" >> $GITHUB_ENV + run: echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl)" >> $GITHUB_ENV - name: Install Rust run: |