Skip to content

Commit

Permalink
Merge pull request #37 from calebccff/werror-and-alpine
Browse files Browse the repository at this point in the history
Add Alpine Linux CI and stop enabling werror for everyone
  • Loading branch information
lumag authored Nov 6, 2023
2 parents bd5c609 + 67f2d38 commit bc5e25f
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 7 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
family: [x86-64]
compiler: [gcc, clang]
container:
- alpine:edge
- alpine:latest
- archlinux:latest
- debian:testing
- debian:stable
Expand Down Expand Up @@ -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' }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cdba-server.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cdba.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 29 additions & 0 deletions ci/alpine.sh
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
# <[email protected]>
#

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"
3 changes: 1 addition & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit bc5e25f

Please sign in to comment.