From 7ecba2db033a85b90f5864b6b211f101fcaf0fca Mon Sep 17 00:00:00 2001
From: Ludvig Michaelsson <ludvig.michaelsson@yubico.com>
Date: Fri, 10 May 2024 12:53:13 +0200
Subject: [PATCH] actions: disambiguate llvm version

OpenBSD 7.4 has multiple llvm versions available, prefer llvm-16.
---
 .actions/build-bsd               | 4 ++--
 .github/workflows/bsd_builds.yml | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.actions/build-bsd b/.actions/build-bsd
index 66fc4e3b..27fa6fa8 100755
--- a/.actions/build-bsd
+++ b/.actions/build-bsd
@@ -15,7 +15,7 @@ cat > "${MANIFEST}" <<- EOF
 image: ${IMAGE}
 packages:
   - cmake
-  - llvm
+  - llvm${LLVM_VERSION:+%${LLVM_VERSION}}
   - pcsc-lite
 EOF
 
@@ -38,7 +38,7 @@ tasks:
       else
         SUDO=sudo
       fi
-      SCAN="/usr/local/bin/scan-build --use-cc=/usr/bin/cc --status-bugs"
+      SCAN="/usr/local/bin/scan-build${LLVM_VERSION:+-${LLVM_VERSION}} --use-cc=/usr/bin/cc --status-bugs"
       cd libfido2
       for T in Debug Release; do
         mkdir build-\$T
diff --git a/.github/workflows/bsd_builds.yml b/.github/workflows/bsd_builds.yml
index 4208d486..3a1285dd 100644
--- a/.github/workflows/bsd_builds.yml
+++ b/.github/workflows/bsd_builds.yml
@@ -18,7 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [freebsd/14.x, openbsd/7.4]
+        include:
+          - { image: freebsd/14.x }
+          - { image: openbsd/7.4, llvm_version: 16 }
     steps:
     - uses: actions/checkout@v4
     - name: dependencies
@@ -27,6 +29,7 @@ jobs:
         sudo apt install -q -y curl jq
     - name: build
       env:
+        LLVM_VERSION: ${{ matrix.llvm_version }}
         IMAGE: ${{ matrix.image }}
         SOURCEHUT_TOKEN: ${{ secrets.SOURCEHUT_TOKEN }}
       run: ./.actions/build-bsd