diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4742f0c..15ea69b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,8 @@ jobs: family: [x86-64] compiler: [gcc, clang] container: + - alpine:edge + - alpine:latest - archlinux:latest - debian:testing - debian:stable @@ -208,7 +210,7 @@ jobs: if: ${{ matrix.variant == 'i386' }} run: | mkdir build - CFLAGS="-m32" LDFLAGS="-m32" meson setup . build + CFLAGS="-m32" LDFLAGS="-m32" meson setup --errorlogs --werror . build - name: Meson init with cross compile if: ${{ matrix.variant == 'cross-compile' }} @@ -228,13 +230,13 @@ jobs: echo "pkg_config_libdir = '${PKG_CONFIG_PATH}'" >> cross.txt cat cross.txt mkdir build - meson setup --cross-file cross.txt . build + meson setup --errorlogs --werror --cross-file cross.txt . build - name: Meson init if: ${{ matrix.variant == '' }} run: | mkdir build - meson setup . build + meson setup --errorlogs --werror . build - name: Compile run: ninja -C build diff --git a/cdba-server.c b/cdba-server.c index df6db01..f1a7157 100644 --- a/cdba-server.c +++ b/cdba-server.c @@ -158,7 +158,7 @@ void cdba_send_buf(int type, size_t len, const void *buf) static int handle_stdin(int fd, void *buf) { - static struct circ_buf recv_buf = { 0 }; + static struct circ_buf recv_buf = { }; struct msg *msg; struct msg hdr; size_t n; diff --git a/cdba.c b/cdba.c index a759aed..00c02b1 100644 --- a/cdba.c +++ b/cdba.c @@ -581,7 +581,7 @@ int main(int argc, char **argv) int timeout_total = 600; struct work *next; struct work *work; - struct circ_buf recv_buf = { 0 }; + struct circ_buf recv_buf = { }; const char *board = NULL; const char *host = NULL; struct timeval now; diff --git a/ci/alpine.sh b/ci/alpine.sh new file mode 100755 index 0000000..c4b5083 --- /dev/null +++ b/ci/alpine.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2021 Canonical Ltd. +# Copyright (c) 2023 Linaro Ltd +# Author: Krzysztof Kozlowski +# +# + +set -ex + +PKGS_CC="gcc" +case $CC in + clang*) + PKGS_CC="clang" + ;; +esac + +apk add \ + linux-headers \ + libftdi1-dev \ + yaml-dev \ + eudev-dev \ + meson \ + musl-dev \ + libc-dev \ + $PKGS_CC + +echo "Install finished: $0" diff --git a/meson.build b/meson.build index 1b1e01b..63cb838 100644 --- a/meson.build +++ b/meson.build @@ -26,8 +26,7 @@ compiler_cflags = ['-Wno-unused-parameter', # TODO add clang specific options if compiler.get_id() == 'gcc' - compiler_cflags += ['-Werror', # Only set it on GCC - '-Wformat-signedness', + compiler_cflags += ['-Wformat-signedness', '-Wduplicated-cond', '-Wduplicated-branches', '-Wvla-larger-than=1',