From 3282029c914fd010e4eada587ad819f2f85f1334 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 28 Jan 2023 14:46:48 -0800 Subject: ci.yml: ensure -Werror really gets used in all cases -Werror wasn't actually being used when building the libraries, as the libraries use CFLAGS_STLIB instead of CFLAGS. Use CFLAGS_WARN, which gets included in both. Note: -Werror can't just be passed to 'configure' like the other flags are, as it interferes with some of the configure checks. Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29482178..97b15bfb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: ./configure CC=gcc CFLAGS="$DEF_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -24,7 +24,7 @@ jobs: sudo apt-get update sudo apt-get install -y clang - run: ./configure CC=clang CFLAGS="$DEF_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -38,7 +38,7 @@ jobs: sudo apt-get update sudo apt-get install -y gcc-multilib - run: ./configure CC=gcc CFLAGS="$DEF_CFLAGS -m32" LDFLAGS="-m32" - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -m32 -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" - run: make -j8 install V=1 DESTDIR=$PWD/installdir - run: make -j8 uninstall V=1 DESTDIR=$PWD/installdir @@ -53,7 +53,7 @@ jobs: sudo apt-get install -y clang - run: echo "ASAN_CFLAGS=$DEF_CFLAGS -fsanitize=address -fno-sanitize-recover=address" >> $GITHUB_ENV - run: ./configure CC=clang CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$ASAN_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" ubsan-build-and-test: name: Build and test with UBSAN enabled @@ -66,7 +66,7 @@ jobs: sudo apt-get install -y clang - run: echo "UBSAN_CFLAGS=$DEF_CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined" >> $GITHUB_ENV - run: ./configure CC=clang CFLAGS="$UBSAN_CFLAGS" LDFLAGS="$UBSAN_CFLAGS" - - run: make -j8 check V=1 CFLAGS="$UBSAN_CFLAGS -Werror" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror" macos-build-and-test: name: Build and test on macOS @@ -76,7 +76,7 @@ jobs: - run: ./configure CFLAGS="$DEF_CFLAGS" # -Wno-error=deprecated-declarations is needed to suppress known warnings # due to e2fsprogs' use of sbrk(0) and daemon(). - - run: make -j8 check V=1 CFLAGS="$DEF_CFLAGS -Werror -Wno-error=deprecated-declarations" + - run: make -j8 check V=1 CFLAGS_WARN="-Werror -Wno-error=deprecated-declarations" - run: make -j8 install DESTDIR=$PWD/installdir - run: make -j8 uninstall DESTDIR=$PWD/installdir @@ -104,13 +104,13 @@ jobs: # dependencies: all libraries except libss. The build system doesn't want # to build just those parts, though, so do it one step at a time... - run: ./configure CFLAGS="$DEF_CFLAGS" - - run: make -j8 subs V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/et/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/uuid/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/blkid/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/ext2fs/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/support/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C lib/e2p/ all V=1 CFLAGS="$DEF_CFLAGS -Werror" - - run: make -j8 -C misc/ mke2fs V=1 CFLAGS="$DEF_CFLAGS -Werror" + - run: make -j8 subs V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/et/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/uuid/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/blkid/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/ext2fs/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/support/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C lib/e2p/ all V=1 CFLAGS_WARN="-Werror" + - run: make -j8 -C misc/ mke2fs V=1 CFLAGS_WARN="-Werror" - run: touch image.ext4 - run: misc/mke2fs.exe -T ext4 image.ext4 128M -- cgit v1.2.1