xxx

Yubico · Nov 7, 2023 · 52fad2a · 52fad2a
1 parent 2d5a046
commit 52fad2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -13,7 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: dependencies
-      run: brew install check cmake help2man libfido2 mandoc pkg-config automake
+      run: |
+        brew install check cmake help2man libfido2 mandoc pkg-config automake
     - name: build
       env:
         CC: ${{ matrix.cc }}

diff --git a/build-aux/ci/build-osx.sh b/build-aux/ci/build-osx.sh
@@ -2,7 +2,10 @@
 set -ex
 
 # Link to the same OpenSSL version as libfido2.
-OPENSSL="$(brew deps --installed libfido2 | grep openssl)"
+OPENSSL="$(brew deps --installed libfido2 | grep openssl || true)"
+if [[ -z "${OPENSSL}" ]]; then
+  OPENSSL="$(brew deps --missing --installed libfido2 | grep openssl)"
+fi
 LIBFIDO2_PKGCONF="$(brew --prefix libfido2)/lib/pkgconfig"
 OPENSSL_PKGCONF="$(brew --prefix "${OPENSSL}")/lib/pkgconfig"
 export PKG_CONFIG_PATH="${LIBFIDO2_PKGCONF}:${OPENSSL_PKGCONF}"