From 7e4e6a3cb11ba07d5ceb57c340a090cb55a170c7 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 26 Jun 2025 11:30:46 +0200 Subject: [PATCH] CI updates --- .github/workflows/ci.yml | 2 +- src/conf.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4388cdcb..64600a82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: run: | export PATH="$(readlink -en ../deps/bin-upx-20221212):$PATH" make -C src/stub maintainer-clean extra-clean - git status || true + git status || true # make sure the stub files got deleted make -C src/stub extra-all all if ! git diff --quiet; then git diff; exit 1; fi - run: bash ./misc/scripts/check_whitespace_git.sh diff --git a/src/conf.h b/src/conf.h index f24f827e..4497aee6 100644 --- a/src/conf.h +++ b/src/conf.h @@ -71,6 +71,10 @@ static_assert((-1) >> 31 == -1); // arithmetic right shift static_assert(CHAR_MAX == 255); // -funsigned-char static_assert((char) (-1) == 255); // -funsigned-char +// disable some more strict warnings +#if defined(__clang__) && __has_warning("-Wunnecessary-virtual-specifier") +#pragma clang diagnostic ignored "-Wunnecessary-virtual-specifier" +#endif // enable some more strict warnings for Git developer builds #if defined(UPX_CONFIG_DISABLE_WSTRICT) && (UPX_CONFIG_DISABLE_WSTRICT + 0 == 0) #if defined(UPX_CONFIG_DISABLE_WERROR) && (UPX_CONFIG_DISABLE_WERROR + 0 == 0)