Skip to content

Commit ee81810

Browse files
committed
github: update workflows
Added call to build-aux/ci/cmake.sh and build-time dependencies.
1 parent 9a8f6cd commit ee81810

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

.github/workflows/alpine_builds.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- name: dependencies
1515
run: |
1616
apk -q update
17-
apk add autoconf automake bash build-base clang clang-analyzer git \
18-
libfido2-dev libtool linux-pam-dev openssl-dev pkgconfig
17+
apk add autoconf automake bash build-base clang clang-analyzer cmake \
18+
git libfido2-dev libtool linux-pam-dev ninja openssl-dev pkgconfig
1919
- name: checkout pam-u2f
2020
uses: actions/checkout@v4
2121
- name: mark workspace as safe
@@ -25,3 +25,7 @@ jobs:
2525
CC: ${{ matrix.cc }}
2626
run: |
2727
./build-aux/ci/build-linux-${CC%-*}.sh
28+
- name: build_cmake
29+
env:
30+
CC: ${{ matrix.cc }}
31+
run: . ./build-aux/ci/cmake.sh

.github/workflows/linux_builds.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
run: |
2424
sudo apt -q update
2525
sudo apt install --no-install-recommends -q -y \
26-
autoconf automake libtool pkg-config libfido2-dev libpam-dev \
27-
git2cl asciidoc-base xsltproc docbook-xsl
26+
asciidoc-base autoconf automake cmake docbook-xsl git2cl libfido2-dev \
27+
libpam-dev libtool ninja-build pkg-config xsltproc
2828
if [ "${CC%-*}" == "clang" ]; then
2929
sudo apt install -q -y ${CC%-*}-tools-${CC#clang-}
3030
else
@@ -40,3 +40,7 @@ jobs:
4040
CC: ${{ matrix.cc }}
4141
run: |
4242
/bin/bash -eux build-aux/ci/distcheck.sh
43+
- name: build_cmake
44+
env:
45+
CC: ${{ matrix.cc }}
46+
run: . ./build-aux/ci/cmake.sh

.github/workflows/macos_builds.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: dependencies
16-
run: brew install check cmake help2man libfido2 mandoc libtool automake
16+
run: brew install check cmake help2man libfido2 mandoc ninja libtool automake
1717
- name: build
1818
env:
1919
CC: ${{ matrix.cc }}
2020
run: ./build-aux/ci/build-osx.sh
21+
- name: build_cmake
22+
env:
23+
CC: ${{ matrix.cc }}
24+
run: . ./build-aux/ci/cmake.sh

0 commit comments

Comments
 (0)