Skip to content

Commit

Permalink
actions: disambiguate llvm version
Browse files Browse the repository at this point in the history
OpenBSD 7.4 has multiple llvm versions available, prefer llvm-16.
  • Loading branch information
LDVG committed May 10, 2024
1 parent 72dae2e commit 52bcf3f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .actions/build-bsd
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cat > "${MANIFEST}" <<- EOF
image: ${IMAGE}
packages:
- cmake
- llvm
- llvm${LLVM_VERSION:+%$LLVM_VERSION}
- pcsc-lite
EOF

Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/bsd_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 52bcf3f

Please sign in to comment.