Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Use Ninja for musl builds #1710

Merged
merged 7 commits into from
Jan 30, 2025
Merged

ci: Use Ninja for musl builds #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8820f30
ci: Use Ninja for musl builds
cpswan Jan 30, 2025
37734d4
ci: Dont fail fast on Docker matrix
cpswan Jan 30, 2025
be13ced
fix: Capitalise Ninja
cpswan Jan 30, 2025
bb79344
build: Try samurai package instead for ninja
cpswan Jan 30, 2025
8d3b315
build: Different name for ninja package
cpswan Jan 30, 2025
2d8cab4
build: Capitalise Ninja (again)
cpswan Jan 30, 2025
9f7214a
Merge branch 'trunk' into cpswan-ninja-build
cpswan Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/c_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ jobs:
run:
working-directory: ./packages/c
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions packages/c/sshnpd/tools/Dockerfile.musl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ WORKDIR /sshnpd
COPY . .
ARG TARGETARCH
RUN set -eux; \
apk add clang cmake coreutils git make python3; \
apk add clang cmake coreutils git make ninja python3; \
case "${TARGETARCH}" in \
amd64) ARCH="x64";;\
*) ARCH=${TARGETARCH};; \
esac; \
cd /sshnpd/sshnpd; \
cmake -B build -S . -DBUILD_SHARED_LIBS=off -DCMAKE_C_COMPILER=clang \
cmake -B build -G Ninja -S . -DBUILD_SHARED_LIBS=off -DCMAKE_C_COMPILER=clang \
-DCMAKE_C_FLAGS="-Wno-error -pthread" -DCMAKE_EXE_LINKER_FLAGS="-static"; \
cmake --build build; \
mkdir /tarball; \
Expand Down